Index: hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java =================================================================== --- hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java (revision 1587764) +++ hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java (working copy) @@ -174,8 +174,9 @@ thriftServer = new ThriftServer(TEST_UTIL.getConfiguration()); startCmdLineThread(args.toArray(new String[0])); - while ( thriftServer.serverRunner == null || thriftServer.serverRunner.tserver == null ){ - Thread.sleep(1); + // wait up to 10s for the server to start + for (int i=0; i<100 && (thriftServer.serverRunner == null || thriftServer.serverRunner.tserver == null); i++) { + Thread.sleep(100); } Class expectedClass = implType != null ?