Increasing the timeout
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/15653d77 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/15653d77 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/15653d77 Branch: refs/heads/master Commit: 15653d770a42947f170769560b8ae4a48bc6321f Parents: 55015ca Author: reka <[email protected]> Authored: Tue Aug 11 16:40:31 2015 +0530 Committer: reka <[email protected]> Committed: Wed Aug 12 08:34:01 2015 +0530 ---------------------------------------------------------------------- .../apache/stratos/integration/tests/TopologyHandler.java | 2 +- .../integration/tests/application/ApplicationUpdateTest.java | 4 ++-- .../stratos/integration/tests/group/CartridgeTest.java | 4 ++-- .../modules/integration/src/test/resources/mock-iaas.xml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/15653d77/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java index 4f2353c..7d1068a 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/TopologyHandler.java @@ -60,7 +60,7 @@ import static junit.framework.Assert.*; public class TopologyHandler { private static final Log log = LogFactory.getLog(TopologyHandler.class); - public static final int APPLICATION_ACTIVATION_TIMEOUT = 180000; + public static final int APPLICATION_ACTIVATION_TIMEOUT = 300000; public static final int APPLICATION_UNDEPLOYMENT_TIMEOUT = 60000; public static final int APPLICATION_TOPOLOGY_TIMEOUT = 60000; public static final String APPLICATION_STATUS_CREATED = "Created"; http://git-wip-us.apache.org/repos/asf/stratos/blob/15653d77/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 f4995f4..fc33908 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 @@ -43,7 +43,7 @@ public class ApplicationUpdateTest extends StratosTestServerManager { @Test public void testDeployApplication() { try { - log.info("Started application runtime update test case**************************************"); + log.info("-------------------------Started application runtime update test case-------------------------"); String autoscalingPolicyId = "autoscaling-policy-application-update-test"; @@ -231,7 +231,7 @@ public class ApplicationUpdateTest extends StratosTestServerManager { "network-partition-application-update-test-2", RestConstants.NETWORK_PARTITIONS_NAME); assertEquals(removedN2, true); - log.info("Ended application runtime update test case**************************************"); + log.info("-------------------------Ended application runtime update test case-------------------------"); } catch (Exception e) { log.error("An error occurred while handling application deployment/undeployment and update", e); http://git-wip-us.apache.org/repos/asf/stratos/blob/15653d77/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java index aec70a3..5be9287 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/group/CartridgeTest.java @@ -40,7 +40,7 @@ public class CartridgeTest extends StratosTestServerManager { @Test public void testCartridge() { - log.info("Started Cartridge test case**************************************"); + log.info("--------------------Started Cartridge test case-----------------------------"); try { String cartridgeType = "c0-cartridge-test"; @@ -121,7 +121,7 @@ public class CartridgeTest extends StratosTestServerManager { CartridgeBean.class, RestConstants.CARTRIDGES_NAME); assertEquals(beanRemoved, null); - log.info("Ended Cartridge test case**************************************"); + log.info("---------------------------Ended Cartridge test case-------------------------"); } catch (Exception e) { log.error("An error occurred while handling RESTConstants.CARTRIDGES_PATH", e); assertTrue("An error occurred while handling RESTConstants.CARTRIDGES_PATH", false); http://git-wip-us.apache.org/repos/asf/stratos/blob/15653d77/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 47eb963..a0f1066 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</sampleValues> + <sampleValues>20,20,20,20</sampleValues> <!-- Duration of each sample value in seconds --> - <sampleDuration>60</sampleDuration> + <sampleDuration>30</sampleDuration> </pattern> <pattern factor="load-average" mode="stop"> <!-- Sample values --> - <sampleValues>20,20</sampleValues> + <sampleValues>20,20,20,20</sampleValues> <!-- Duration of each sample value in seconds --> - <sampleDuration>60</sampleDuration> + <sampleDuration>30</sampleDuration> </pattern> </cartridge> <cartridge type="php">
