Repository: bigtop Updated Branches: refs/heads/master 7006b7f70 -> d609e926a
BIGTOP-1592. Integration test IntegrationTestClusterFailures is failing Signed-off-by: Konstantin Boudnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/d609e926 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/d609e926 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/d609e926 Branch: refs/heads/master Commit: d609e926a181d516f988f9793c07829dfe587a5c Parents: 7006b7f Author: Dasha Boudnik <[email protected]> Authored: Mon Jan 12 17:40:48 2015 -0800 Committer: Konstantin Boudnik <[email protected]> Committed: Mon Jan 12 23:29:44 2015 -0800 ---------------------------------------------------------------------- .../bigtop/itest/failures/FailureVars.groovy | 40 ++++++++++---------- .../IntegrationTestClusterFailures.groovy | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/d609e926/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy ---------------------------------------------------------------------- diff --git a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy index d1cb045..3b3f6af 100644 --- a/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy +++ b/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/failures/FailureVars.groovy @@ -28,16 +28,16 @@ public class FailureVars { private final int SLEEP_TIME = 100; private static FailureVars instance = null; private String propertyFile = System.getProperty("failurePropertiesFile"); - private String testHost; - private String testRemoteHost; - private String runFailures; - private String serviceRestart; - private String serviceKill; - private String networkShutdown; - private String service; - private String failureDelay; - private String startDelay; - private String killDuration; + private String testHost = "localhost"; + private String testRemoteHost = "apache.org"; + private String runFailures = "false"; + private String serviceRestart = "false"; + private String serviceKill = "false"; + private String networkShutdown = "false"; + private String service = "crond"; + private String failureDelay = "0"; + private String startDelay = "0"; + private String killDuration = "0"; { switch (OS.linux_flavor) { @@ -71,16 +71,16 @@ public class FailureVars { Properties props = new Properties(); props.load(is); is.close(); - testHost = props.getProperty("testhost", "localhost"); - testRemoteHost = props.getProperty("testremotehost", "apache.org"); - runFailures = props.getProperty("runall", Boolean.FALSE.toString()); - serviceRestart = props.getProperty("servicerestart", Boolean.FALSE.toString()); - serviceKill = props.getProperty("servicekill", Boolean.FALSE.toString()); - networkShutdown = props.getProperty("networkshutdown", Boolean.FALSE.toString()); - service = props.getProperty("service", "crond"); - failureDelay = props.getProperty("failuredelay", Integer.toString(0)); - startDelay = props.getProperty("startdelay", Integer.toString(0)); - killDuration = props.getProperty("killduration", Integer.toString(0)); + testHost = props.getProperty("testhost"); + testRemoteHost = props.getProperty("testremotehost"); + runFailures = props.getProperty("runall"); + serviceRestart = props.getProperty("servicerestart"); + serviceKill = props.getProperty("servicekill"); + networkShutdown = props.getProperty("networkshutdown"); + service = props.getProperty("service"); + failureDelay = props.getProperty("failuredelay"); + startDelay = props.getProperty("startdelay"); + killDuration = props.getProperty("killduration"); } catch(IOException ioe) { System.out.println(ioe.getMessage()); http://git-wip-us.apache.org/repos/asf/bigtop/blob/d609e926/bigtop-test-framework/src/test/groovy/org/apache/bigtop/itest/failures/IntegrationTestClusterFailures.groovy ---------------------------------------------------------------------- diff --git a/bigtop-test-framework/src/test/groovy/org/apache/bigtop/itest/failures/IntegrationTestClusterFailures.groovy b/bigtop-test-framework/src/test/groovy/org/apache/bigtop/itest/failures/IntegrationTestClusterFailures.groovy index 2799f85..a36cc1a 100644 --- a/bigtop-test-framework/src/test/groovy/org/apache/bigtop/itest/failures/IntegrationTestClusterFailures.groovy +++ b/bigtop-test-framework/src/test/groovy/org/apache/bigtop/itest/failures/IntegrationTestClusterFailures.groovy @@ -45,7 +45,7 @@ public class IntegrationTestClusterFailures { @Before void configureVars() { - def f = new FailureVars(); + def f = FailureVars.getInstance(); testHost = f.getTestHost(); testRemoteHost = f.getTestRemoteHost(); serviceRestart = f.getServiceRestart();
