SLIDER-201 split environment checks into separate methods for isolated testing
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index a8f8608..74e0bfb 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -1962,10 +1962,22 @@
IOException,
SliderException {
maybeVerifyWinUtilsValid(logger);
- execCommand(OPENSSL, 0, 5000, logger, "OpenSSL", OPENSSL, "version");
+ validatePythonEnv(logger);
+ validateOpenSSLEnv(logger);
+ }
+
+ public static void validateOpenSSLEnv(Logger logger) throws
+ IOException,
+ SliderException {
execCommand(PYTHON, 0, 5000, logger, "Python", PYTHON, "-V");
}
+ public static void validatePythonEnv(Logger logger) throws
+ IOException,
+ SliderException {
+ execCommand(OPENSSL, 0, 5000, logger, "OpenSSL", OPENSSL, "version");
+ }
+
/**
* return the path to the currently running slider command
*
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestExecutionEnvironment.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestExecutionEnvironment.groovy
index 5489366..7ca6c49 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestExecutionEnvironment.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestExecutionEnvironment.groovy
@@ -32,11 +32,19 @@
SliderUtils.validateSliderClientEnvironment(log)
}
-
@Test
public void testServerEnv() throws Throwable {
SliderUtils.validateSliderServerEnvironment(log)
}
+ @Test
+ public void testopenSSLEnv() throws Throwable {
+ SliderUtils.validateOpenSSLEnv(log)
+ }
+
+ @Test
+ public void testValidatePythonEnv() throws Throwable {
+ SliderUtils.validatePythonEnv(log)
+ }
}
diff --git a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
index 98fa183..61960e6 100644
--- a/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/common/tools/TestWindowsSupport.groovy
@@ -176,7 +176,7 @@
process.init(new Configuration());
EndOfServiceWaiter waiter = new EndOfServiceWaiter(process);
process.start();
- waiter.waitForServiceToStop(5000);
+ waiter.waitForServiceToStop(10000);
process
}
}
