Repository: stratos Updated Branches: refs/heads/tenant-isolation a6296d6da -> 01eafd733
Update integration test with tenants Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9ff60fa6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9ff60fa6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9ff60fa6 Branch: refs/heads/tenant-isolation Commit: 9ff60fa6064e66e67fdb1fcb087c06bb8ae74f6f Parents: a6296d6 Author: Gayan Gunarathne <[email protected]> Authored: Fri Aug 14 18:25:42 2015 +0530 Committer: Gayan Gunarathne <[email protected]> Committed: Fri Aug 14 18:25:42 2015 +0530 ---------------------------------------------------------------------- .../tests/application/PartitionRoundRobinClusterTest.java | 4 ++-- .../modules/integration/src/test/resources/stratos-testing.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/9ff60fa6/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java index 855bbcc..1d095c7 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/PartitionRoundRobinClusterTest.java @@ -103,7 +103,7 @@ public class PartitionRoundRobinClusterTest extends StratosTestServerManager { TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId(), -1234); //Verifying whether members got created using round robin algorithm - /* assertClusterWithRoundRobinAlgorithm(bean.getApplicationId()); + /* assertClusterWithRoundRobinAlgorithm(bean.getApplicationId()); */ //Application in-active handling log.info("Waiting for the faulty member detection from " + @@ -116,7 +116,7 @@ public class PartitionRoundRobinClusterTest extends StratosTestServerManager { ApplicationStatus.Active,-1234); //Cluster active handling - TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId(),-1234); */ + TopologyHandler.getInstance().assertClusterActivation(bean.getApplicationId(),-1234); boolean removedAuto = restClientTenant1.removeEntity(RestConstants.AUTOSCALING_POLICIES, autoscalingPolicyId, RestConstants.AUTOSCALING_POLICIES_NAME); http://git-wip-us.apache.org/repos/asf/stratos/blob/9ff60fa6/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 cd65ade..cc59cd6 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" /> @@ -73,7 +73,7 @@ <classes> <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" /> </classes> - </test> + </test> --> <test name="PartitionRoundRobinClusterTest"> <classes> <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" />
