updating to increase the retries + refactor test code
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f8f280f9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f8f280f9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f8f280f9 Branch: refs/heads/master Commit: f8f280f967b5e1cd5e314fffca1ee7bb08256b02 Parents: d953a3f Author: Saminda Wijeratne <[email protected]> Authored: Tue Jul 8 14:19:26 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Tue Jul 8 14:19:26 2014 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/integration/AbstractIntegrationTest.java | 2 +- .../apache/airavata/integration/SingleAppIntegrationTestBase.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/f8f280f9/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java ---------------------------------------------------------------------- diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java index 24ac14d..51bd31c 100644 --- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java +++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java @@ -38,7 +38,7 @@ public class AbstractIntegrationTest { private static int THRIFT_SERVER_PORT; protected AiravataAPI airavataAPI; protected Airavata.Client client; - private final int TRIES = 5; + private final int TRIES = 20; private final int TIME_OUT = 10000; final static Logger log = LoggerFactory.getLogger(AbstractIntegrationTest.class); http://git-wip-us.apache.org/repos/asf/airavata/blob/f8f280f9/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java ---------------------------------------------------------------------- diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java index 4a21fda..84bd528 100644 --- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java +++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java @@ -62,9 +62,8 @@ public class SingleAppIntegrationTestBase extends AbstractIntegrationTest { } Thread.sleep(2000); } catch (Exception e) { - log.error("Thread interrupted", e.getMessage()); + log.error("Thread interrupted", e); } - System.out.println(experimentStatus.getExperimentState().toString()); Assert.assertFalse(experimentStatus.getExperimentState().equals(ExperimentState.FAILED)); }while(!experimentStatus.getExperimentState().equals(ExperimentState.COMPLETED)); }
