Resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/238c3c48 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/238c3c48 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/238c3c48 Branch: refs/heads/master Commit: 238c3c48c3e6209ea2061a6fa7694e88de20491e Parents: 218fc1f Author: gayangunarathne <[email protected]> Authored: Tue Sep 1 17:58:53 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Tue Sep 1 17:58:53 2015 +0530 ---------------------------------------------------------------------- .../src/test/resources/stratos-testing.xml | 37 +++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/238c3c48/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 b9107c8..7a2c1e1 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" /> @@ -53,30 +53,33 @@ <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" /> </classes> </test> + <test name="SampleApplicationsTest"> <classes> <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" /> </classes> </test> - <test name="ApplicationBurstingTest"> + +<!-- + <test name="ApplicationBurstingTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> + </classes> + </test> + <test name="SingleClusterScalingTest"> <classes> - <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> + <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" /> </classes> </test> - <test name="SingleClusterScalingTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" /> - </classes> - </test> - <test name="PartitionRoundRobinClusterTest"> + <test name="PartitionRoundRobinClusterTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> + </classes> + </test> + + <test name="GroupTerminationBehaviorTest"> <classes> - <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> + <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" /> </classes> - </test> - - <test name="GroupTerminationBehaviorTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.GroupTerminationBehaviorTest" /> - </classes> - </test>--> + </test>--> </suite>
