You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/04/09 07:08:14 UTC
git commit: fixing test cases
Repository: airavata
Updated Branches:
refs/heads/master e16173855 -> fa32f4dad
fixing test cases
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fa32f4da
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fa32f4da
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fa32f4da
Branch: refs/heads/master
Commit: fa32f4dadc4dcadf1732be42b38995c4e152c862
Parents: e161738
Author: lahiru <la...@apache.org>
Authored: Wed Apr 9 01:07:50 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Wed Apr 9 01:07:50 2014 -0400
----------------------------------------------------------------------
.../gsi/ssh/config/ConfigReaderTest.java | 1 +
.../ssh/config/SCPFromTestWithMyProxyAuth.java | 1 +
.../impl/DefaultSSHApiTestWithMyProxyAuth.java | 62 ++------------------
.../gsi/ssh/impl/VanilaTestWithSSHAuth.java | 1 +
4 files changed, 9 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa32f4da/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/ConfigReaderTest.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/ConfigReaderTest.java b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/ConfigReaderTest.java
index d9ac2bb..ba5bf6a 100644
--- a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/ConfigReaderTest.java
+++ b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/ConfigReaderTest.java
@@ -29,6 +29,7 @@ public class ConfigReaderTest {
@Test
public void testGetConfiguration() throws Exception {
+ System.out.println("Test case name " + this.getClass().getName());
ConfigReader configReader = new ConfigReader();
Assert.assertEquals(configReader.getConfiguration("StrictHostKeyChecking"), "no");
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa32f4da/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/SCPFromTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/SCPFromTestWithMyProxyAuth.java b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/SCPFromTestWithMyProxyAuth.java
index 4e893c9..c8a29f5 100644
--- a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/SCPFromTestWithMyProxyAuth.java
+++ b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/config/SCPFromTestWithMyProxyAuth.java
@@ -39,6 +39,7 @@ public class SCPFromTestWithMyProxyAuth {
@BeforeTest
public void setUp() throws Exception {
+ System.out.println("Test case name " + this.getClass().getName());
// System.setProperty("myproxy.user", "ogce");
// System.setProperty("myproxy.password", "");
// System.setProperty("gsi.certificate.path", "/Users/lahirugunathilake/Downloads/certificates");
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa32f4da/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java
index 320c8b8..222141a 100644
--- a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java
+++ b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java
@@ -50,20 +50,17 @@ public class DefaultSSHApiTestWithMyProxyAuth {
@BeforeTest
public void setUp() throws Exception {
-// System.setProperty("myproxy.user", "ogce");
-// System.setProperty("myproxy.password", "");
-// System.setProperty("basedir", "/Users/lahirugunathilake/Downloads");
-// System.setProperty("gsi.working.directory", "/home/ogce");
+ System.out.println("Test case name " + this.getClass().getName());
+ System.setProperty("myproxy.user", "ogce");
+ System.setProperty("myproxy.password", "");
+ System.setProperty("gsi.certificate.path", "/Users/lahirugunathilake/Downloads/certificates");
+ System.setProperty("gsi.working.directory", "/home/ogce");
+
certificateLocation = System.getProperty("gsi.certificate.path");
myProxyUserName = System.getProperty("myproxy.user");
myProxyPassword = System.getProperty("myproxy.password");
workingDirectory = System.getProperty("gsi.working.directory");
slurmWorkingDirectory = "/home1/01437/ogce";
- String pomDirectory = System.getProperty("basedir");
-
- File pomFileDirectory = new File(pomDirectory);
-
- System.out.println("POM directory ----------------- " + pomFileDirectory.getAbsolutePath());
if (myProxyUserName == null || myProxyPassword == null || workingDirectory == null) {
System.out.println(">>>>>> Please run tests with my proxy user name and password. " +
@@ -199,50 +196,6 @@ public class DefaultSSHApiTestWithMyProxyAuth {
System.out.println(jobDescriptor.toXML());
jobID = pbsCluster.submitBatchJob(jobDescriptor);
System.out.println("JobID returned : " + jobID);
-
-// Cluster cluster = sshApi.getCluster(serverInfo, authenticationInfo);
-// Thread.sleep(1000);
-
- JobDescriptor jobById = pbsCluster.getJobDescriptorById(jobID);
-
- //printing job data got from previous call
- AssertJUnit.assertEquals(jobById.getJobId(), jobID);
- System.out.println(jobById.getAcountString());
- System.out.println(jobById.getAllEnvExport());
- System.out.println(jobById.getCompTime());
- System.out.println(jobById.getExecutablePath());
- System.out.println(jobById.getEllapsedTime());
- System.out.println(jobById.getQueueName());
- System.out.println(jobById.getExecuteNode());
- System.out.println(jobById.getJobName());
- System.out.println(jobById.getCTime());
- System.out.println(jobById.getSTime());
- System.out.println(jobById.getMTime());
- System.out.println(jobById.getCompTime());
- System.out.println(jobById.getOwner());
- System.out.println(jobById.getQTime());
- System.out.println(jobById.getUsedCPUTime());
- System.out.println(jobById.getUsedMemory());
- System.out.println(jobById.getVariableList());
- }
-
-
- @Test
- public void testGetCluster() throws Exception {
-// GSIAuthenticationInfo authenticationInfo
-// = new MyProxyAuthenticationInfo(myProxyUserName, myProxyPassword, "myproxy.teragrid.org",
-// 7512, 17280000);
-// // Server info
-// ServerInfo serverInfo = new ServerInfo("ogce", "trestles.sdsc.edu");
-// // Get the API
-// SSHApi sshApi = SSHApiFactory.createSSHApi(this.certificateLocation);
-// Cluster cluster = sshApi.getCluster(serverInfo, authenticationInfo);
-// System.out.println(cluster.getNodes()[0].getName());
-// System.out.println(cluster.getNodes()[0].getNp());
-// System.out.println(cluster.getNodes()[0].getState());
-// System.out.println(cluster.getNodes()[0].getCores()[0].getId());
-// System.out.println(cluster.getNodes()[0].getName());
-
}
@@ -333,9 +286,6 @@ public class DefaultSSHApiTestWithMyProxyAuth {
log.error("Error during job status monitoring");
throw new SSHApiException("Error during job status monitoring", e);
}
- while (!listener.isJobDone()) {
- Thread.sleep(10000);
- }
}
@Test
http://git-wip-us.apache.org/repos/asf/airavata/blob/fa32f4da/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java
index 461ea8a..527ee32 100644
--- a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java
+++ b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java
@@ -50,6 +50,7 @@ public class VanilaTestWithSSHAuth {
@BeforeTest
public void setUp() throws Exception {
+ System.out.println("Test case name " + this.getClass().getName());
this.hostName = "trestles.sdsc.edu";
// this.userName = System.setProperty("my.ssh.user", "lginnali");