Repository: hbase Updated Branches: refs/heads/branch-2 72a29211c -> cf59f2a1d
HBASE-21128 TestAsyncRegionAdminApi.testAssignRegionAndUnassignRegion is broken Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cf59f2a1 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cf59f2a1 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cf59f2a1 Branch: refs/heads/branch-2 Commit: cf59f2a1d2f0f00bfa94f2fb9729c93789b0bc7c Parents: 72a2921 Author: Duo Zhang <zhang...@apache.org> Authored: Wed Aug 29 18:06:02 2018 +0800 Committer: Duo Zhang <zhang...@apache.org> Committed: Thu Aug 30 10:09:49 2018 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/client/TestAsyncRegionAdminApi.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/cf59f2a1/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java index a8ad424..338db00 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java @@ -17,9 +17,11 @@ */ package org.apache.hadoop.hbase.client; +import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -83,7 +85,13 @@ public class TestAsyncRegionAdminApi extends TestAsyncAdminBase { // Region is assigned now. Let's assign it again. // Master should not abort, and region should stay assigned. - admin.assign(hri.getRegionName()).get(); + try { + admin.assign(hri.getRegionName()).get(); + fail("Should fail when assigning an already onlined region"); + } catch (ExecutionException e) { + // Expected + assertThat(e.getCause(), instanceOf(DoNotRetryRegionException.class)); + } try { am.waitForAssignment(hri); fail("Expected NoSuchProcedureException");
