You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/04/21 15:08:15 UTC
[1/2] git commit: cosmetics to integration tests
Repository: airavata
Updated Branches:
refs/heads/master 832a7151f -> 3013e74f8
cosmetics to integration tests
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6fe3d3a5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6fe3d3a5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6fe3d3a5
Branch: refs/heads/master
Commit: 6fe3d3a5fba05c7d3fd8d6483e02ebcac1fda2a8
Parents: 832a715
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Sat Apr 19 08:51:19 2014 -0700
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Sat Apr 19 08:51:19 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/airavata/integration/SimpleEchoIT.java | 4 ++--
.../airavata/integration/SingleAppIntegrationTestBase.java | 9 +++------
2 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6fe3d3a5/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java
index 1414dfe..e1da9f6 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SimpleEchoIT.java
@@ -52,7 +52,7 @@ public class SimpleEchoIT extends SingleAppIntegrationTestBase {
@Test
public void testSimpleLocalhostEchoService() throws Exception {
log.info("Running job in localhost");
- log.info("========================\n");
+ log.info("========================");
log.info("Adding applications...");
DocumentCreator documentCreator = new DocumentCreator(airavataAPI);
documentCreator.createLocalHostDocs();
@@ -92,7 +92,7 @@ public class SimpleEchoIT extends SingleAppIntegrationTestBase {
log.info("Experiment launched successfully\n");
log.info("Monitoring job in localhost");
- log.info("===========================\n");
+ log.info("===========================");
monitorJob(expId);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6fe3d3a5/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 41e4dd8..fd5578f 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
@@ -124,12 +124,9 @@ public class SingleAppIntegrationTestBase {
ExperimentStatus experimentStatus = client.getExperimentStatus(expId);
if (previousUpdateTime!=experimentStatus.getTimeOfStateChange()) {
previousUpdateTime=experimentStatus.getTimeOfStateChange();
- log.info("Experiment ID:"
- + expId
- + " Status : "
- + experimentStatus.getExperimentState()
- .toString()
- + "["+new Date(previousUpdateTime).toString()+"]");
+ log.info(expId
+ + " : " + experimentStatus.getExperimentState().toString()
+ + " ["+new Date(previousUpdateTime).toString()+"]");
}
if (experimentStatus.getExperimentState()==ExperimentState.COMPLETED){
[2/2] git commit: adding 'CENCELING' status
Posted by sa...@apache.org.
adding 'CENCELING' status
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3013e74f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3013e74f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3013e74f
Branch: refs/heads/master
Commit: 3013e74f867c93aa71b9f9dce56e0b8b7b0805cf
Parents: 6fe3d3a
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Mon Apr 21 06:07:57 2014 -0700
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Mon Apr 21 06:07:57 2014 -0700
----------------------------------------------------------------------
.../thrift-interface-descriptions/experimentModel.thrift | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3013e74f/airavata-api/thrift-interface-descriptions/experimentModel.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
index 7fb79ed..f01ae7d 100644
--- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift
+++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift
@@ -59,6 +59,7 @@ enum ExperimentState {
SCHEDULED,
LAUNCHED,
EXECUTING,
+ CANCELING,
CANCELED,
COMPLETED,
FAILED,
@@ -73,6 +74,7 @@ struct ExperimentStatus {
enum WorkflowNodeState {
INVOKED,
EXECUTING,
+ CANCELING,
CANCELED,
COMPLETED,
FAILED,
@@ -93,6 +95,7 @@ enum TaskState {
OUTPUT_DATA_STAGING,
POST_PROCESSING,
EXECUTING,
+ CANCELING,
CANCELED,
COMPLETED,
FAILED,
@@ -111,6 +114,7 @@ enum JobState {
QUEUED,
ACTIVE,
COMPLETE,
+ CANCELING,
CANCELED,
FAILED,
HELD,
@@ -131,6 +135,7 @@ enum TransferState {
COMPLETE,
STDOUT_DOWNLOAD,
STDERROR_DOWNLOAD,
+ CANCELING,
CANCELED,
FAILED,
HELD,