HBASE-8482 TestHBaseFsck#testCheckTableLocks broke; java.lang.AssertionError: expected:<[]> but was:<[EXPIRED_TABLE_LOCK]>

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1478556 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-05-02 21:13:31 +00:00
parent d5b80e422b
commit 1a516ff5b7
2 changed files with 2 additions and 3 deletions

View File

@ -21,7 +21,6 @@ package org.apache.hadoop.hbase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.HasThread;
import org.apache.hadoop.hbase.util.Sleeper;
@ -73,7 +72,7 @@ public abstract class Chore extends HasThread {
try {
boolean initialChoreComplete = false;
while (!this.stopper.isStopped()) {
long startTime = EnvironmentEdgeManager.currentTimeMillis();
long startTime = System.currentTimeMillis();
try {
if (!initialChoreComplete) {
initialChoreComplete = initialChore();

View File

@ -1939,7 +1939,7 @@ public class TestHBaseFsck {
}
}
@Test(timeout=30000)
@Test(timeout=60000)
public void testCheckTableLocks() throws Exception {
IncrementingEnvironmentEdge edge = new IncrementingEnvironmentEdge(0);
EnvironmentEdgeManager.injectEdge(edge);