Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-11574. Addendum for a failing UT in branch-1 (tedyu)

This commit is contained in:
Devaraj Das 2015-01-29 09:57:48 -08:00
parent c66fdf1e83
commit 8ddc90c209
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
View File

@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellScannable; import org.apache.hadoop.hbase.CellScannable;
import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CoordinatedStateException; import org.apache.hadoop.hbase.CoordinatedStateException;
@ -683,6 +684,8 @@ public class TestAssignmentManager {
Mockito.when(services.getZooKeeper()).thenReturn(this.watcher); Mockito.when(services.getZooKeeper()).thenReturn(this.watcher);
Mockito.when(services.getMasterFileSystem()).thenReturn(fs); Mockito.when(services.getMasterFileSystem()).thenReturn(fs);
Mockito.when(services.getConnection()).thenReturn(connection); Mockito.when(services.getConnection()).thenReturn(connection);
Configuration conf = server.getConfiguration();
Mockito.when(services.getConfiguration()).thenReturn(conf);
ServerShutdownHandler handler = new ServerShutdownHandler(this.server, ServerShutdownHandler handler = new ServerShutdownHandler(this.server,
services, deadServers, SERVERNAME_A, false); services, deadServers, SERVERNAME_A, false);
am.failoverCleanupDone.set(true); am.failoverCleanupDone.set(true);