AMQ-5964 - Increasing test timeouts

This commit is contained in:
Christopher L. Shannon (cshannon) 2015-09-17 20:04:37 +00:00
parent d2bd152960
commit 5107262998
1 changed files with 6 additions and 6 deletions

View File

@ -101,7 +101,7 @@ public class PeriodicDiskUsageLimitTest {
* if the usage limit is now less than the store size plus remaining free space, then * if the usage limit is now less than the store size plus remaining free space, then
* the usage limits will adjust lower. * the usage limits will adjust lower.
*/ */
@Test(timeout=30000) @Test(timeout=60000)
public void testDiskUsageAdjustLower() throws Exception { public void testDiskUsageAdjustLower() throws Exception {
//set the limit to max space so that if a file is added to eat up free space then //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 //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 * 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. * 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 { public void testDiskUsageAdjustLowerAndHigherUsingPercent() throws Exception {
//set the limit to max space so that if a file is added to eat up free space then //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 //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 * This test shows that the usage limits will not change if the
* schedulePeriodForDiskLimitCheck property is not set because no task will run * schedulePeriodForDiskLimitCheck property is not set because no task will run
*/ */
@Test(timeout=30000) @Test(timeout=60000)
public void testDiskLimitCheckNotSet() throws Exception { public void testDiskLimitCheckNotSet() throws Exception {
setLimitMaxSpace(); setLimitMaxSpace();
startBroker(); startBroker();
@ -218,7 +218,7 @@ public class PeriodicDiskUsageLimitTest {
* This test shows that the usage limits will not change if the * This test shows that the usage limits will not change if the
* schedulePeriodForDiskLimitCheck property is not set because no task will run * schedulePeriodForDiskLimitCheck property is not set because no task will run
*/ */
@Test(timeout=30000) @Test(timeout=60000)
public void testDiskLimitCheckNotSetUsingPercent() throws Exception { public void testDiskLimitCheckNotSetUsingPercent() throws Exception {
tempUsage.setPercentLimit(getFreePercentage(broker.getTempDataStore().getDirectory()) + 5); tempUsage.setPercentLimit(getFreePercentage(broker.getTempDataStore().getDirectory()) + 5);
storeUsage.setPercentLimit(getFreePercentage(adapter.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 * if the limit is greater than the store size and the remaining free space, then
* the usage limits will not adjust. * the usage limits will not adjust.
*/ */
@Test(timeout=30000) @Test(timeout=60000)
public void testDiskUsageStaySame() throws Exception { public void testDiskUsageStaySame() throws Exception {
//set a limit lower than max available space and set the period to 5 seconds //set a limit lower than max available space and set the period to 5 seconds
tempUsage.setLimit(10000000); 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 * if the limit is greater than the store size and the remaining free space, then
* the usage limits will not adjust. * the usage limits will not adjust.
*/ */
@Test(timeout=30000) @Test(timeout=60000)
public void testDiskUsageStaySameUsingPercent() throws Exception { public void testDiskUsageStaySameUsingPercent() throws Exception {
//set a limit lower than max available space and set the period to 5 seconds //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 //only run if at least 4 percent disk space free