airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [2/2] airavata git commit: changing the order
Date Thu, 16 Mar 2017 19:49:57 GMT
changing the order


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

Branch: refs/heads/develop
Commit: 0c8c2ae00d031c36135fb61302b0d30c2310d5e1
Parents: a135c82
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Thu Mar 16 15:49:52 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Thu Mar 16 15:49:52 2017 -0400

----------------------------------------------------------------------
 .../org/apache/airavata/sharing/registry/CipresTest.java     | 8 +-------
 .../sharing/registry/SharingRegistryServiceTest.java         | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/0c8c2ae0/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
index e12664f..8ca65b4 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/CipresTest.java
@@ -21,7 +21,6 @@
 package org.apache.airavata.sharing.registry;
 
 import org.apache.airavata.sharing.registry.models.*;
-import org.apache.airavata.sharing.registry.server.ServerMain;
 import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
@@ -37,16 +36,11 @@ public class CipresTest {
     public static void main(String[] args) throws InterruptedException {
         System.out.println("Hello World!");
         //should use the correct host name and port here
-//        String serverHost = "wb-airavata.scigap.org";
-        String serverHost = "localhost";
+        String serverHost = "wb-airavata.scigap.org";
 
         int serverPort = 7878;
         TTransport transport = null;
 
-        ServerMain serverMain = new ServerMain();
-        serverMain.main(new String[]{});
-        Thread.sleep(1000 * 2);
-
         try {
             transport = new TSocket(serverHost, serverPort);
             transport.open();

http://git-wip-us.apache.org/repos/asf/airavata/blob/0c8c2ae0/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
index 112500e..15a84c6 100644
--- a/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
+++ b/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
@@ -28,6 +28,7 @@ import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
+import org.databene.contiperf.PerfTest;
 import org.databene.contiperf.junit.ContiPerfRule;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -54,7 +55,7 @@ public class SharingRegistryServiceTest {
 
 
     @Test
-//    @PerfTest(invocations = 50, threads = 10)
+    @PerfTest(invocations = 50, threads = 10)
     public void test() throws TException, InterruptedException {
         String serverHost = "localhost";
         int serverPort = 7878;


Mime
View raw message