Repository: hbase Updated Branches: refs/heads/master 11e3a8387 -> 3fa27c238
HBASE-19941 Flaky TestCreateTableProcedure times out in nightly, needs to LargeTests Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3fa27c23 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3fa27c23 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3fa27c23 Branch: refs/heads/master Commit: 3fa27c2382a70f692eb36d191228f9e796800ffb Parents: 11e3a83 Author: Umesh Agashe <uaga...@cloudera.com> Authored: Mon Feb 5 22:11:05 2018 -0800 Committer: Michael Stack <st...@apache.org> Committed: Mon Feb 5 22:13:53 2018 -0800 ---------------------------------------------------------------------- .../master/procedure/TestCreateTableProcedure.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3fa27c23/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java index 056155f..3fa756b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableProcedure.java @@ -57,14 +57,14 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase { @Rule public TestName name = new TestName(); - @Test(timeout=60000) + @Test public void testSimpleCreate() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); final byte[][] splitKeys = null; testSimpleCreate(tableName, splitKeys); } - @Test(timeout=60000) + @Test public void testSimpleCreateWithSplits() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); final byte[][] splitKeys = new byte[][] { @@ -79,7 +79,7 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase { MasterProcedureTestingUtility.validateTableCreation(getMaster(), tableName, regions, F1, F2); } - @Test(timeout=60000) + @Test public void testCreateWithoutColumnFamily() throws Exception { final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor(); final TableName tableName = TableName.valueOf(name.getMethodName()); @@ -101,7 +101,7 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase { cause instanceof DoNotRetryIOException); } - @Test(timeout=60000, expected=TableExistsException.class) + @Test(expected=TableExistsException.class) public void testCreateExisting() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor(); @@ -124,7 +124,7 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase { latch2.await(); } - @Test(timeout=60000) + @Test public void testRecoveryAndDoubleExecution() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); @@ -144,13 +144,13 @@ public class TestCreateTableProcedure extends TestTableDDLProcedureBase { MasterProcedureTestingUtility.validateTableCreation(getMaster(), tableName, regions, F1, F2); } - @Test(timeout=90000) + @Test public void testRollbackAndDoubleExecution() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); testRollbackAndDoubleExecution(TableDescriptorBuilder.newBuilder(MasterProcedureTestingUtility.createHTD(tableName, F1, F2))); } - @Test(timeout=90000) + @Test public void testRollbackAndDoubleExecutionOnMobTable() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName()); TableDescriptor htd = MasterProcedureTestingUtility.createHTD(tableName, F1, F2);
