airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject git commit: fixng Qstat test to work with maven
Date Mon, 14 Apr 2014 20:18:36 GMT
Repository: airavata
Updated Branches:
  refs/heads/master b1bdbd918 -> 3330060ee


fixng Qstat test to work with maven


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3330060e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3330060e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3330060e

Branch: refs/heads/master
Commit: 3330060ee9832f4c6f7abb111616489be0e34706
Parents: b1bdbd9
Author: lahiru <lahiru@apache.org>
Authored: Mon Apr 14 16:18:05 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Mon Apr 14 16:18:05 2014 -0400

----------------------------------------------------------------------
 .../job/monitor/QstatMonitorTestWithMyProxyAuth.java      |  6 +++---
 .../airavata/job/QstatMonitorTestWithMyProxyAuth.java     | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/3330060e/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
index b48d809..53abae3 100644
--- a/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
+++ b/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTestWithMyProxyAuth.java
@@ -33,8 +33,8 @@ import org.apache.airavata.job.monitor.exception.AiravataMonitorException;
 import org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor;
 import org.apache.airavata.persistance.registry.jpa.impl.RegistryFactory;
 import org.apache.airavata.schemas.gfac.GsisshHostType;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -51,7 +51,7 @@ public class QstatMonitorTestWithMyProxyAuth {
     private String workingDirectory;
     private HostDescription hostDescription;
 
-    @Before
+    @BeforeClass
     public void setUp() throws Exception {
 //        System.setProperty("myproxy.username", "ogce");
 //        System.setProperty("myproxy.password", "");

http://git-wip-us.apache.org/repos/asf/airavata/blob/3330060e/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
b/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
index 0bd95b3..af429a3 100644
--- a/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
+++ b/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
@@ -33,14 +33,9 @@ import org.apache.airavata.gsi.ssh.util.CommonUtils;
 import org.apache.airavata.job.monitor.MonitorID;
 import org.apache.airavata.job.monitor.UserMonitorData;
 import org.apache.airavata.job.monitor.event.MonitorPublisher;
-import org.apache.airavata.job.monitor.exception.AiravataMonitorException;
 import org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor;
-import org.apache.airavata.job.monitor.state.JobStatus;
-import org.apache.airavata.model.workspace.experiment.JobState;
 import org.apache.airavata.schemas.gfac.GsisshHostType;
-import org.junit.Before;
-import org.junit.Test;
-import sun.jvm.hotspot.utilities.Assert;
+import org.testng.annotations.Test;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -59,7 +54,8 @@ public class QstatMonitorTestWithMyProxyAuth {
     private MonitorPublisher monitorPublisher;
     private BlockingQueue<UserMonitorData> pullQueue;
     private Thread monitorThread;
-    @Before
+
+    @org.testng.annotations.BeforeClass
     public void setUp() throws Exception {
 //        System.setProperty("myproxy.username", "ogce");
 //        System.setProperty("myproxy.password", "");


Mime
View raw message