You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/19 06:40:10 UTC

[2/6] stratos git commit: Update the integration test with tenant operations

Update the integration test with tenant operations


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/86fdc880
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/86fdc880
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/86fdc880

Branch: refs/heads/tenant-isolation
Commit: 86fdc880a77ca6f071853e9f2bd14a546268fc34
Parents: d9f93dc
Author: gayangunarathne <ga...@wso2.com>
Authored: Tue Aug 18 20:06:52 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Tue Aug 18 20:06:52 2015 +0530

----------------------------------------------------------------------
 .../integration/tests/application/ApplicationUpdateTest.java | 4 ++--
 .../integration/src/test/resources/stratos-testing.xml       | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/86fdc880/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java
index e199055..092e6c4 100644
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationUpdateTest.java
@@ -86,7 +86,7 @@ public class ApplicationUpdateTest extends StratosTestServerManager {
                     "deployment-policy-application-update-test", RestConstants.DEPLOYMENT_POLICIES_NAME);
             assertEquals(removedDep, false);
 
-           // testApplicationRuntimeForTenant(restClientTenant2,tenant2Id,autoscalingPolicyId);
+            testApplicationRuntimeForTenant(restClientTenant2,tenant2Id,autoscalingPolicyId);
 
             //Un-deploying the application
             String resourcePathUndeploy = RestConstants.APPLICATIONS + "/" + "g-sc-G123-1-application-update-test" +
@@ -164,7 +164,7 @@ public class ApplicationUpdateTest extends StratosTestServerManager {
                     "network-partition-application-update-test-2", RestConstants.NETWORK_PARTITIONS_NAME);
             assertEquals(removedN2, true);
 
-           // testApplicationUndeplymentForTenant(restClientTenant2,tenant2Id,autoscalingPolicyId);
+            testApplicationUndeplymentForTenant(restClientTenant2,tenant2Id,autoscalingPolicyId);
 
             log.info("-------------------------Ended application runtime update test case-------------------------");
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/86fdc880/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
index d9660b9..c9de52a 100644
--- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
+++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
@@ -21,7 +21,7 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
 <suite name="StratosIntegrationSuite">
-
+  <!--
    <test name="CartridgeTest">
        <classes>
            <class name="org.apache.stratos.integration.tests.group.CartridgeTest" />
@@ -85,5 +85,11 @@
             <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" />
         </classes>
     </test>
+    -->
+    <test name="ApplicationUpdateTest">
+        <classes>
+            <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest" />
+        </classes>
+    </test>
 
 </suite>