HBASE-7994 Disable unit tests under hbase-examples; they fail too often up on jenkins; APPLIED BOTH ORIGINAL PATCH AND ADDENDUM IN ONE GO

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1453091 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-03-05 23:32:21 +00:00
parent 1429b373c6
commit d40c5b2e83
3 changed files with 23 additions and 20 deletions

View File

@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
@Category(MediumTests.class)
@ -64,19 +65,19 @@ public class TestBulkDeleteProtocol {
private static final byte[] QUALIFIER3 = Bytes.toBytes("c3");
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
@BeforeClass
@Ignore @BeforeClass
public static void setupBeforeClass() throws Exception {
TEST_UTIL.getConfiguration().set(CoprocessorHost.USER_REGION_COPROCESSOR_CONF_KEY,
BulkDeleteEndpoint.class.getName());
TEST_UTIL.startMiniCluster(2);
}
@AfterClass
@Ignore @AfterClass
public static void tearDownAfterClass() throws Exception {
TEST_UTIL.shutdownMiniCluster();
}
@Test
@Ignore @Test
public void testBulkDeleteEndpoint() throws Throwable {
byte[] tableName = Bytes.toBytes("testBulkDeleteEndpoint");
HTable ht = createTable(tableName);
@ -98,7 +99,7 @@ public class TestBulkDeleteProtocol {
ht.close();
}
@Test
@Ignore @Test
public void testBulkDeleteEndpointWhenRowBatchSizeLessThanRowsToDeleteFromARegion()
throws Throwable {
byte[] tableName = Bytes
@ -126,10 +127,10 @@ public class TestBulkDeleteProtocol {
final DeleteType deleteType, final Long timeStamp) throws Throwable {
HTable ht = new HTable(TEST_UTIL.getConfiguration(), tableName);
long noOfDeletedRows = 0L;
Batch.Call<BulkDeleteService, BulkDeleteResponse> callable =
Batch.Call<BulkDeleteService, BulkDeleteResponse> callable =
new Batch.Call<BulkDeleteService, BulkDeleteResponse>() {
ServerRpcController controller = new ServerRpcController();
BlockingRpcCallback<BulkDeleteResponse> rpcCallback =
BlockingRpcCallback<BulkDeleteResponse> rpcCallback =
new BlockingRpcCallback<BulkDeleteResponse>();
public BulkDeleteResponse call(BulkDeleteService service) throws IOException {
@ -153,7 +154,7 @@ public class TestBulkDeleteProtocol {
return noOfDeletedRows;
}
@Test
@Ignore @Test
public void testBulkDeleteWithConditionBasedDelete() throws Throwable {
byte[] tableName = Bytes.toBytes("testBulkDeleteWithConditionBasedDelete");
HTable ht = createTable(tableName);
@ -183,7 +184,7 @@ public class TestBulkDeleteProtocol {
ht.close();
}
@Test
@Ignore @Test
public void testBulkDeleteColumn() throws Throwable {
byte[] tableName = Bytes.toBytes("testBulkDeleteColumn");
HTable ht = createTable(tableName);
@ -212,7 +213,7 @@ public class TestBulkDeleteProtocol {
ht.close();
}
@Test
@Ignore @Test
public void testBulkDeleteFamily() throws Throwable {
byte[] tableName = Bytes.toBytes("testBulkDeleteFamily");
HTableDescriptor htd = new HTableDescriptor(tableName);
@ -243,7 +244,7 @@ public class TestBulkDeleteProtocol {
ht.close();
}
@Test
@Ignore @Test
public void testBulkDeleteColumnVersion() throws Throwable {
byte[] tableName = Bytes.toBytes("testBulkDeleteColumnVersion");
HTable ht = createTable(tableName);
@ -291,7 +292,7 @@ public class TestBulkDeleteProtocol {
ht.close();
}
@Test
@Ignore @Test
public void testBulkDeleteColumnVersionBasedOnTS() throws Throwable {
byte[] tableName = Bytes.toBytes("testBulkDeleteColumnVersionBasedOnTS");
HTable ht = createTable(tableName);
@ -338,7 +339,7 @@ public class TestBulkDeleteProtocol {
ht.close();
}
@Test
@Ignore @Test
public void testBulkDeleteWithNumberOfVersions() throws Throwable {
byte[] tableName = Bytes.toBytes("testBulkDeleteWithNumberOfVersions");
HTable ht = createTable(tableName);
@ -379,10 +380,10 @@ public class TestBulkDeleteProtocol {
long noOfDeletedRows = 0L;
long noOfVersionsDeleted = 0L;
Batch.Call<BulkDeleteService, BulkDeleteResponse> callable =
Batch.Call<BulkDeleteService, BulkDeleteResponse> callable =
new Batch.Call<BulkDeleteService, BulkDeleteResponse>() {
ServerRpcController controller = new ServerRpcController();
BlockingRpcCallback<BulkDeleteResponse> rpcCallback =
BlockingRpcCallback<BulkDeleteResponse> rpcCallback =
new BlockingRpcCallback<BulkDeleteResponse>();
public BulkDeleteResponse call(BulkDeleteService service) throws IOException {

View File

@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
import java.io.IOException;
@ -53,7 +54,7 @@ public class TestRowCountEndpoint {
private static HBaseTestingUtility TEST_UTIL = null;
private static Configuration CONF = null;
@BeforeClass
@Ignore @BeforeClass
public static void setupBeforeClass() throws Exception {
TEST_UTIL = new HBaseTestingUtility();
CONF = TEST_UTIL.getConfiguration();
@ -64,12 +65,12 @@ public class TestRowCountEndpoint {
TEST_UTIL.createTable(TEST_TABLE, TEST_FAMILY);
}
@AfterClass
@Ignore @AfterClass
public static void tearDownAfterClass() throws Exception {
TEST_UTIL.shutdownMiniCluster();
}
@Test
@Ignore @Test
public void testEndpoint() throws Throwable {
HTable table = new HTable(CONF, TEST_TABLE);

View File

@ -41,6 +41,7 @@ import org.apache.zookeeper.ZooKeeper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
@Category(MediumTests.class)
@ -51,7 +52,7 @@ public class TestZooKeeperScanPolicyObserver {
private static final byte[] Q = Bytes.toBytes("qual");
private static final byte[] R = Bytes.toBytes("row");
@BeforeClass
@Ignore @BeforeClass
public static void setUpBeforeClass() throws Exception {
// Test we can first start the ZK cluster by itself
Configuration conf = TEST_UTIL.getConfiguration();
@ -61,12 +62,12 @@ public class TestZooKeeperScanPolicyObserver {
TEST_UTIL.startMiniCluster();
}
@AfterClass
@Ignore @AfterClass
public static void tearDownAfterClass() throws Exception {
TEST_UTIL.shutdownMiniCluster();
}
@Test
@Ignore @Test
public void testScanPolicyObserver() throws Exception {
byte[] tableName = Bytes.toBytes("testScanPolicyObserver");
HTableDescriptor desc = new HTableDescriptor(tableName);