Repository: activemq Updated Branches: refs/heads/master d2bd15296 -> 510726299
AMQ-5964 - Increasing test timeouts Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/51072629 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/51072629 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/51072629 Branch: refs/heads/master Commit: 5107262998a22d854e1cd18f6911da2169ac5885 Parents: d2bd152 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Thu Sep 17 20:04:37 2015 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Thu Sep 17 20:04:37 2015 +0000 ---------------------------------------------------------------------- .../activemq/usage/PeriodicDiskUsageLimitTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/51072629/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java index 48c6c4b..eadae27 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/PeriodicDiskUsageLimitTest.java @@ -101,7 +101,7 @@ public class PeriodicDiskUsageLimitTest { * if the usage limit is now less than the store size plus remaining free space, then * the usage limits will adjust lower. */ - @Test(timeout=30000) + @Test(timeout=60000) public void testDiskUsageAdjustLower() throws Exception { //set the limit to max space so that if a file is added to eat up free space then //the broker should adjust the usage limit..set time to 5 seconds for testing @@ -137,7 +137,7 @@ public class PeriodicDiskUsageLimitTest { * if the usage limit is now less than the store size plus remaining free space, then * the usage limits will adjust lower. Then test that size regrows when file is deleted. */ - @Test(timeout=30000) + @Test(timeout=60000) public void testDiskUsageAdjustLowerAndHigherUsingPercent() throws Exception { //set the limit to max space so that if a file is added to eat up free space then //the broker should adjust the usage limit..add 5% above free space @@ -197,7 +197,7 @@ public class PeriodicDiskUsageLimitTest { * This test shows that the usage limits will not change if the * schedulePeriodForDiskLimitCheck property is not set because no task will run */ - @Test(timeout=30000) + @Test(timeout=60000) public void testDiskLimitCheckNotSet() throws Exception { setLimitMaxSpace(); startBroker(); @@ -218,7 +218,7 @@ public class PeriodicDiskUsageLimitTest { * This test shows that the usage limits will not change if the * schedulePeriodForDiskLimitCheck property is not set because no task will run */ - @Test(timeout=30000) + @Test(timeout=60000) public void testDiskLimitCheckNotSetUsingPercent() throws Exception { tempUsage.setPercentLimit(getFreePercentage(broker.getTempDataStore().getDirectory()) + 5); storeUsage.setPercentLimit(getFreePercentage(adapter.getDirectory()) + 5); @@ -241,7 +241,7 @@ public class PeriodicDiskUsageLimitTest { * if the limit is greater than the store size and the remaining free space, then * the usage limits will not adjust. */ - @Test(timeout=30000) + @Test(timeout=60000) public void testDiskUsageStaySame() throws Exception { //set a limit lower than max available space and set the period to 5 seconds tempUsage.setLimit(10000000); @@ -267,7 +267,7 @@ public class PeriodicDiskUsageLimitTest { * if the limit is greater than the store size and the remaining free space, then * the usage limits will not adjust. */ - @Test(timeout=30000) + @Test(timeout=60000) public void testDiskUsageStaySameUsingPercent() throws Exception { //set a limit lower than max available space and set the period to 5 seconds //only run if at least 4 percent disk space free
