Author: mbautin Date: Thu Feb 2 22:49:13 2012 New Revision: 1239900 URL: http://svn.apache.org/viewvc?rev=1239900&view=rev Log: [Master] Fix 2 unit test failure
Summary: There are 3 unit test failure recently. Fix the TestMemStore and TestStoreScanner here. I will followup the third one TestColumnSeeking later, which is not related to this diff. Test Plan: running all the unit tests now Reviewers: kannan Reviewed By: kannan CC: hbase-eng@lists Differential Revision: https://phabricator.fb.com/D398503 Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java?rev=1239900&r1=1239899&r2=1239900&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java Thu Feb 2 22:49:13 2012 @@ -32,11 +32,13 @@ import junit.framework.TestCase; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics; import org.apache.hadoop.hbase.util.Bytes; import com.google.common.base.Joiner; @@ -60,7 +62,8 @@ public class TestMemStore extends TestCa super.setUp(); this.rwcc = new ReadWriteConsistencyControl(); this.memstore = new MemStore(); - } + SchemaMetrics.configureGlobally(HBaseConfiguration.create()); + } public void testPutSameKey() { byte [] bytes = Bytes.toBytes(getName()); Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java?rev=1239900&r1=1239899&r2=1239900&view=diff ============================================================================== --- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java (original) +++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java Thu Feb 2 22:49:13 2012 @@ -20,29 +20,32 @@ package org.apache.hadoop.hbase.regionserver; -import junit.framework.TestCase; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.KeyValueTestUtil; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.util.Bytes; -import org.mockito.Mockito; -import org.mockito.stubbing.OngoingStubbing; - -import com.google.common.collect.Lists; +import static org.apache.hadoop.hbase.regionserver.KeyValueScanFixture.scanFixture; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.NavigableSet; import java.util.TreeSet; -import static org.apache.hadoop.hbase.regionserver.KeyValueScanFixture.scanFixture; + +import junit.framework.TestCase; + +import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.KeyValueTestUtil; +import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics; +import org.apache.hadoop.hbase.util.Bytes; public class TestStoreScanner extends TestCase { private static final String CF_STR = "cf"; final byte [] CF = Bytes.toBytes(CF_STR); + @Override + public void setUp() throws Exception { + SchemaMetrics.configureGlobally(HBaseConfiguration.create()); + } /* * Test utility for building a NavigableSet for scanners. * @param strCols
