hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject hbase git commit: HBASE-11574. Addendum for a failing UT in branch-1 (tedyu)
Date Thu, 29 Jan 2015 17:58:19 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 c66fdf1e8 -> 8ddc90c20


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


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8ddc90c2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8ddc90c2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8ddc90c2

Branch: refs/heads/branch-1
Commit: 8ddc90c209671a71de211f465ea6c07a96061189
Parents: c66fdf1
Author: Devaraj Das <ddas@apache.org>
Authored: Thu Jan 29 09:57:48 2015 -0800
Committer: Devaraj Das <ddas@apache.org>
Committed: Thu Jan 29 09:57:48 2015 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/master/TestAssignmentManager.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/8ddc90c2/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
index 65dc2ab..9e8097e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.CellScannable;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.CoordinatedStateException;
@@ -683,6 +684,8 @@ public class TestAssignmentManager {
       Mockito.when(services.getZooKeeper()).thenReturn(this.watcher);
       Mockito.when(services.getMasterFileSystem()).thenReturn(fs);
       Mockito.when(services.getConnection()).thenReturn(connection);
+      Configuration conf = server.getConfiguration();
+      Mockito.when(services.getConfiguration()).thenReturn(conf);
       ServerShutdownHandler handler = new ServerShutdownHandler(this.server,
           services, deadServers, SERVERNAME_A, false);
       am.failoverCleanupDone.set(true);


Mime
View raw message