Repository: hbase
Updated Branches:
  refs/heads/branch-1 19721046a -> 5aeddb305
  refs/heads/branch-1.2 e4c0c97d4 -> 3d8f8aea7
  refs/heads/branch-1.3 f17911b15 -> 63655b549
  refs/heads/branch-1.4 95d16a5ff -> fa3d572d2


HBASE-18864 (addendum) Fixed unit test failure 
TestFromClientSide#testIllegalTableDescriptor

Signed-off-by: Andrew Purtell <apurt...@apache.org>


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

Branch: refs/heads/branch-1
Commit: 5aeddb3051e81b81843dc1e1e1deb16317b7a6a9
Parents: 1972104
Author: Sakthi <jatsak...@cloudera.com>
Authored: Wed Mar 14 11:43:01 2018 -0700
Committer: Andrew Purtell <apurt...@apache.org>
Committed: Wed Mar 14 13:57:08 2018 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/client/TestFromClientSide.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5aeddb30/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 6f73409..58ff20f 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -5577,9 +5577,13 @@ public class TestFromClientSide {
     checkTableIsIllegal(htd);
     hcd.setMinVersions(3);
 
-    hcd.setScope(-1);
-    checkTableIsIllegal(htd);
-    hcd.setScope(0);
+    try {
+      hcd.setScope(-1);
+      fail("Illegal value for setScope did not throw");
+    } catch (IllegalArgumentException e) {
+      // expected
+      hcd.setScope(0);
+    }
     checkTableIsLegal(htd);
 
     try {

Reply via email to