Amend HBASE-10103. Fix testHealthCheckerTimeout and add default test timeouts

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1549994 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Kyle Purtell 2013-12-10 22:58:45 +00:00
parent 9871ed8a0a
commit 5981dc4511
1 changed files with 5 additions and 5 deletions

View File

@ -56,21 +56,21 @@ public class TestNodeHealthCheckChore {
if (!fs.mkdirs(testDir)) throw new IOException("Failed mkdir " + testDir); if (!fs.mkdirs(testDir)) throw new IOException("Failed mkdir " + testDir);
} }
@Test @Test(timeout=60000)
public void testHealthCheckerSuccess() throws Exception { public void testHealthCheckerSuccess() throws Exception {
String normalScript = "echo \"I am all fine\""; String normalScript = "echo \"I am all fine\"";
healthCheckerTest(normalScript, HealthCheckerExitStatus.SUCCESS); healthCheckerTest(normalScript, HealthCheckerExitStatus.SUCCESS);
} }
@Test @Test(timeout=60000)
public void testHealthCheckerFail() throws Exception { public void testHealthCheckerFail() throws Exception {
String errorScript = "echo ERROR" + eol + "echo \"Node not healthy\""; String errorScript = "echo ERROR" + eol + "echo \"Node not healthy\"";
healthCheckerTest(errorScript, HealthCheckerExitStatus.FAILED); healthCheckerTest(errorScript, HealthCheckerExitStatus.FAILED);
} }
@Test @Test(timeout=60000)
public void testHealthCheckerTimeout() throws Exception { public void testHealthCheckerTimeout() throws Exception {
String timeOutScript = "sleep " + (SCRIPT_TIMEOUT * 2) + eol + "echo \"I am fine\""; String timeOutScript = "sleep 10" + eol + "echo \"I am fine\"";
healthCheckerTest(timeOutScript, HealthCheckerExitStatus.TIMED_OUT); healthCheckerTest(timeOutScript, HealthCheckerExitStatus.TIMED_OUT);
} }
@ -93,7 +93,7 @@ public class TestNodeHealthCheckChore {
this.healthScriptFile.delete(); this.healthScriptFile.delete();
} }
@Test @Test(timeout=60000)
public void testRSHealthChore() throws Exception{ public void testRSHealthChore() throws Exception{
Stoppable stop = new StoppableImplementation(); Stoppable stop = new StoppableImplementation();
Configuration conf = getConfForNodeHealthScript(); Configuration conf = getConfForNodeHealthScript();