fixing test failures with wrong application name
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/55015ca4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/55015ca4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/55015ca4 Branch: refs/heads/master Commit: 55015ca4177f0f13645b516dd19843dcf1d54ae7 Parents: f78ab82 Author: reka <[email protected]> Authored: Tue Aug 11 14:55:51 2015 +0530 Committer: reka <[email protected]> Committed: Wed Aug 12 08:34:01 2015 +0530 ---------------------------------------------------------------------- .../application/ApplicationBurstingTest.java | 10 ++++---- .../integration/tests/rest/RestClient.java | 1 - .../src/test/resources/mock-iaas.xml | 8 +++---- .../src/test/resources/stratos-testing.xml | 25 ++++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/55015ca4/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java index b869b37..b47fb73 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/application/ApplicationBurstingTest.java @@ -151,17 +151,17 @@ public class ApplicationBurstingTest extends StratosTestServerManager { RestConstants.APPLICATIONS_NAME); assertEquals(unDeployed, true); - boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app"); + boolean undeploy = TopologyHandler.getInstance().assertApplicationUndeploy("application-bursting-test"); if (!undeploy) { //Need to forcefully undeploy the application - log.info("Force undeployment is going to start for the [application] " + "cartridge-group-app"); + log.info("Force undeployment is going to start for the [application] " + "application-bursting-test"); - restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "cartridge-group-app" + + restClient.undeployEntity(RestConstants.APPLICATIONS + "/" + "application-bursting-test" + RestConstants.APPLICATIONS_UNDEPLOY + "?force=true", RestConstants.APPLICATIONS); - boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("cartridge-group-app"); + boolean forceUndeployed = TopologyHandler.getInstance().assertApplicationUndeploy("application-bursting-test"); assertEquals(String.format("Forceful undeployment failed for the application %s", - "cartridge-group-app"), forceUndeployed, true); + "application-bursting-test"), forceUndeployed, true); } http://git-wip-us.apache.org/repos/asf/stratos/blob/55015ca4/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java index 79e41a2..34a9d75 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/rest/RestClient.java @@ -158,7 +158,6 @@ public class RestClient { HttpResponse response = doPost(uri, content); if (response != null) { - Thread.sleep(5000); if ((response.getStatusCode() >= 200) && (response.getStatusCode() < 300)) { return true; } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/55015ca4/products/stratos/modules/integration/src/test/resources/mock-iaas.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml b/products/stratos/modules/integration/src/test/resources/mock-iaas.xml index a0f1066..47eb963 100644 --- a/products/stratos/modules/integration/src/test/resources/mock-iaas.xml +++ b/products/stratos/modules/integration/src/test/resources/mock-iaas.xml @@ -68,15 +68,15 @@ stop: stop publishing statistics --> <pattern factor="memory-consumption" mode="stop"> <!-- Sample values --> - <sampleValues>20,20,20,20</sampleValues> + <sampleValues>20,20</sampleValues> <!-- Duration of each sample value in seconds --> - <sampleDuration>30</sampleDuration> + <sampleDuration>60</sampleDuration> </pattern> <pattern factor="load-average" mode="stop"> <!-- Sample values --> - <sampleValues>20,20,20,20</sampleValues> + <sampleValues>20,20</sampleValues> <!-- Duration of each sample value in seconds --> - <sampleDuration>30</sampleDuration> + <sampleDuration>60</sampleDuration> </pattern> </cartridge> <cartridge type="php"> http://git-wip-us.apache.org/repos/asf/stratos/blob/55015ca4/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 5014b41..428c8fa 100644 --- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml +++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml @@ -20,8 +20,8 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > -<suite name="StratosIntegrationSuite" parallel="tests" thread-count="5"> - <test name="CartridgeTest"> +<suite name="StratosIntegrationSuite"> + <!--<test name="CartridgeTest"> <classes> <class name="org.apache.stratos.integration.tests.group.CartridgeTest" /> </classes> @@ -56,25 +56,26 @@ <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" /> </classes> </test> - <!--test name="ApplicationBurstingTest"> + <test name="ApplicationUpdateTest"> <classes> - <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> + <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest" /> </classes> - </test--> - <!--test name="SingleClusterScalingTest"> + </test> + <test name="SingleClusterScalingTest"> <classes> <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" /> </classes> + </test>--> + <test name="ApplicationBurstingTest"> + <classes> + <class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" /> + </classes> </test> <test name="PartitionRoundRobinClusterTest"> <classes> <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" /> </classes> - </test--> - <!--<test name="ApplicationUpdateTest"> - <classes> - <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest" /> - </classes> - </test>--> + </test> + </suite>
