hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1199604 [1/3] - in /hbase/trunk: ./ dev-support/ src/test/java/org/apache/hadoop/hbase/ src/test/java/org/apache/hadoop/hbase/avro/ src/test/java/org/apache/hadoop/hbase/catalog/ src/test/java/org/apache/hadoop/hbase/client/ src/test/java/...
Date Wed, 09 Nov 2011 03:38:13 GMT
Author: tedyu
Date: Wed Nov  9 03:38:10 2011
New Revision: 1199604

URL: http://svn.apache.org/viewvc?rev=1199604&view=rev
Log:
HBASE-4737  Categorize the tests into small/medium/large; allow small tests to be run
               in parallel within a single JVM (N Keywal)

Added:
    hbase/trunk/dev-support/hbasetests.sh
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/LargeTests.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/MediumTests.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/SmallTests.java
Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSingleSizeCache.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestOpenedRegionHandler.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestRpcMetrics.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileBlockCacheSummary.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationPeer.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestTransform.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdmin.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTable.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Nov  9 03:38:10 2011
@@ -34,6 +34,8 @@ Release 0.93.0 - Unreleased
    HBASE-1744  Thrift server to match the new java api (Tim Sell)
    HBASE-4746  Use a random ZK client port in unit tests so we can run them in parallel
                (Mikhail Bautin)
+   HBASE-4737  Categorize the tests into small/medium/large; allow small tests to be run
+               in parallel within a single JVM (N Keywal)
 
   BUG FIXES
    HBASE-4488  Store could miss rows during flush (Lars H via jgray)

Added: hbase/trunk/dev-support/hbasetests.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/dev-support/hbasetests.sh?rev=1199604&view=auto
==============================================================================
--- hbase/trunk/dev-support/hbasetests.sh (added)
+++ hbase/trunk/dev-support/hbasetests.sh Wed Nov  9 03:38:10 2011
@@ -0,0 +1,400 @@
+#!/usr/bin/env bash
+#
+# This script:
+#   - analyse the content of the .java test file to split them between
+#         small/medium/large
+#   - launch the small tests in a single maven, with surefire
+#          parallelisation activated
+#   - launch the medium & large in two maven, parallelized
+#   - the flaky tests are run at the end, not parallelized
+#   - present a small report of the global results
+#   - copy the failed test reports with prefix 'fail_' and a timestamp
+#         to protect them from a later deletion by maven
+#   - if configured for, relaunch the tests in errors
+#
+#
+# Caveats:
+#   - multiple maven are launch, hence there can be recompilation
+#  between the tests if a file is modified. For non flaky tests and
+#  parallelization, the frame is the time to execute the small tests,
+#  so it's around 4 minutes.
+#   - Note that surefire is buggy, and the results presented while
+#  running may be wrong. For example, it can says that a class tests
+#  have 5 errors. When you look at the file it wrote, it says that the
+#  2 tests are ok, and in the class there are actually two tests
+#  methods, not five. If you generate the report at the end with
+#  surefire-report it's fine however.
+#
+######################################### parameters
+
+#set to 0 to run only developpers tests (small & medium categories)
+runAllTests=0
+
+#set to 1 to replay the failed tests. Previous reports are kept in
+# fail_ files
+replayFailed=0 
+
+#set to 0 to run all medium & large tests in a single maven operation
+# instead of two
+parallelMaven=1
+
+#harcoded list of tests that often fail. We don't want to add any
+# complexity around then so there are not run in parallel but after
+# the others
+#The ',' at the end is mandatory
+flakyTests=
+#org.apache.hadoop.hbase.mapreduce.TestTableInputFormatScan,org.apache.hadoop.hbase.catalog.TestMetaReaderEditorNoCluster,org.apache.hadoop.hbase.catalog.TestMetaReaderEditor,org.apache.hadoop.hbase.mapreduce.TestHFileOutputFormat,org.apache.hadoop.hbase.mapred.TestTableMapReduce,org.apache.hadoop.hbase.coprocessor.TestMasterCoprocessorExceptionWithAbort,org.apache.hadoop.hbase.coprocessor.TestMasterCoprocessorExceptionWithRemove,org.apache.hadoop.hbase.client.TestAdmin,org.apache.hadoop.hbase.master.TestMasterFailover,org.apache.hadoop.hbase.regionserver.wal.TestLogRolling,org.apache.hadoop.hbase.master.TestDistributedLogSplitting,org.apache.hadoop.hbase.master.TestMasterRestartAfterDisablingTable,org.apache.hadoop.hbase.TestGlobalMemStoreSize,
+
+######################################### Internal parameters
+#directory used for surefire & the source code.
+#They should not need to be modified
+#The final / is mandatory
+rootTestClassDirectory="./src/test/java/"
+surefireReportDirectory="./target/surefire-reports/"
+
+#variable to use to debug the script without launching the tests
+mvnCommand=mvn
+#mvnCommand=echo
+
+######################################### Functions
+#get the list of the process considered as dead
+# i.e.: in the same group as the script and with a ppid of 1
+# We do this because surefire can leave some dead process, so
+# we will jstack them and kill them
+function createListDeadProcess {
+  id=$$
+  listDeadProcess=""
+  
+  #list of the process with a ppid of 1
+  sonProcess=`ps -o pid= --ppid 1`
+  
+  #then the process with a pgid of the script
+  for pId in $sonProcess
+  do
+    pgid=`ps -o pgid= --pid $pId | sed 's/ //g'`
+    if [ "$pgid" == "$id" ]
+    then
+      listDeadProcess="$pId $listDeadProcess"
+    fi
+  done
+}
+
+#kill the java sub process, if any, with a kill and a kill -9
+#When maven/surefire fails, it lefts some process with a ppid==1
+#we're going to find them with the pgid, print the stack and kill them.
+function cleanProcess {
+  id=$$
+
+  createListDeadProcess
+  for pId in $listDeadProcess
+  do
+    echo "$pId survived, I will kill if it's a java process. 'ps' says:"
+    ps -fj --pid $pId
+    name=`ps -o comm= --pid $pId`
+    if [ "$name" == "java" ]
+    then
+      echo "$pId, java sub process of $id, is still running, killing it with a standard kill"
+      echo "Stack for $pId before kill:"
+      jstack -F -l $pId
+      kill $pId
+      echo "kill sent, waiting for 30 seconds"
+      sleep 30      
+      son=`ps -o pid= --pid $pId | wc -l`
+      if (test $son -gt 0)
+      then 
+        echo "$pId, java sub process of $id, is still running after a nice kill, using kill -9 now"
+        echo "Stack for $pId before kill -9:"
+        jstack -F -l $pId
+        kill -9 $pId
+        echo "Process $pId killed by kill -9" 
+      else
+        echo "Process $pId killed by standard kill -9" 
+      fi
+    else
+      echo "$pId is not a java process (it's $name), I don't kill it."
+    fi
+  done
+  
+  createListDeadProcess
+  if (test ${#listDeadProcess} -gt 0)
+  then
+    echo "There are still $sonProcess for process $id left."
+  else
+    echo "Process $id clean, no son process left"      
+  fi  
+}
+
+#count the number of ',' in a string
+# used to calculate the number of class
+#write $count
+function countClasses {
+  cars=`echo $1 | sed 's/[^,]//g' | wc -c `
+  count=$((cars - 1))
+}
+
+  
+######################################### script
+echo "Starting Script. Possible parameters are: runAllTests, replayFailed, nonParallelMaven"
+echo "Other parameters are sent to maven"
+
+#We will use this value at the end to calculate the execution time
+startTime=`date +%s`
+
+#look in the arguments if we override default values
+for arg in "$@"
+do
+  if [ $arg == "runAllTests" ]
+  then
+    runAllTests=1
+  else
+    if [ $arg == "replayFailed" ]
+    then
+      replayFailed=1
+    else
+      if [ $arg == "nonParallelMaven" ]
+      then
+        parallelMaven=0
+      else  
+         args=$args" $arg"        
+      fi
+    fi
+  fi   
+done
+
+
+
+testsList=$(find $rootTestClassDirectory -name "Test*.java")
+
+
+#for all java test files, let see if they contain the pattern
+# to recognize the category
+for testFile in $testsList
+do
+  lenPath=$((${#rootTestClassDirectory}))
+  len=$((${#testFile} - $lenPath - 5))  # len(".java") == 5
+  
+  shortTestFile=${testFile:lenPath:$len}  
+  testName=$(echo $shortTestFile | sed 's/\//\./g')
+  
+  #The ',' is used in the grep pattern as we don't want to catch
+  # partial name
+  isFlaky=$((`echo $flakyTests | grep "$testName," | wc -l`))
+  
+  if (test $isFlaky -eq 0)
+  then    
+    isSmall=0
+    isMedium=0
+    isLarge=0
+  
+    # determine the category of the test by greping into the source code 
+    isMedium=`grep "@Category" $testFile | grep "MediumTests.class" | wc -l`
+    if (test $isMedium -eq 0) 
+    then 
+      isLarge=`grep "@Category" $testFile | grep "LargeTests.class" | wc -l`
+      if (test $isLarge -eq 0)
+      then 
+        isSmall=1
+        #sanity check on small tests
+        isStrange=`grep "\.startMini" $testFile | wc -l`
+        if (test $isStrange -gt 0)
+        then
+          echo "$testFile is categorized as 'small' but contains a .startMini string. Keep it as small anyway"
+        fi
+      fi
+    fi
+    
+    #put the test in the right list
+    if (test $isSmall -gt 0) 
+    then 
+      smallList="$smallList,$testName"
+    fi    
+    if (test $isMedium -gt 0) 
+    then 
+      mediumList="$mediumList,$testName"
+    fi    
+    if (test $isLarge -gt 0) 
+    then 
+      largeList="$largeList,$testName"
+    fi        
+    
+  fi   
+done
+
+#remove the ',' at the beginning
+smallList=${smallList:1:${#smallList}}
+mediumList=${mediumList:1:${#mediumList}}
+largeList=${largeList:1:${#largeList}}
+
+countClasses $smallList
+echo "There are $count small tests"
+
+countClasses $mediumList
+echo "There are $count medium tests"
+
+countClasses $largeList
+echo "There are $count large tests"
+
+
+
+
+#do we launch only dev or all tests?
+if (test $runAllTests -eq 1)
+then
+  echo "Running all tests, small, medium and large"
+  longList="$mediumList,$largeList"
+else
+  echo "Running developper tests only, small and medium categories"
+  longList=$mediumList
+fi
+
+#medium and large test can be run in //, so we're
+#going to create two lists
+nextList=1
+for testClass in `echo $longList | sed 's/,/ /g'`
+do
+  if (test $nextList -eq 1)
+  then
+    nextList=2
+    runList1=$runList1,$testClass
+  else
+    nextList=1 
+    runList2=$runList2,$testClass
+  fi
+done
+
+#remove the ',' at the beginning
+runList1=${runList1:1:${#runList1}}
+runList2=${runList2:1:${#runList2}}
+
+#now we can run the tests, at last!
+
+echo "Running small tests with one maven instance, in parallel"
+
+$mvnCommand -P parallelTests test -Dtest=$smallList  $args 
+cleanProcess
+
+exeTime=$(((`date +%s` - $startTime)/60))
+echo "Small tests executed after $exeTime minutes"
+
+if (test $parallelMaven -gt 0)
+then 
+  echo "Running tests with two maven instances in parallel"
+  $mvnCommand -P nonParallelTests test -Dtest=$runList1  $args &
+  
+  #give some time  to the fist process if there is anything to compile
+  sleep 30
+  $mvnCommand -P nonParallelTests test -Dtest=$runList2  $args
+
+  #wait for forked process to finish
+  wait
+  
+  cleanProcess
+  
+  exeTime=$(((`date +%s` - $startTime)/60))
+  echo "Medium and large (if selected) tests executed after $exeTime minutes"
+
+  #now the flaky tests, alone, if the list is not empty
+  # we test on size greater then 5 to remove any "," effect
+  if (test $runAllTests -eq 1 && test ${#flakyTests} -gt 5)
+  then
+    echo "Running flaky tests"
+    $mvnCommand -P nonParallelTests test -Dtest=$flakyTests $args
+    cleanProcess
+    exeTime=$(((`date +%s` - $startTime)/60))
+    echo "Flaky tests executed after $exeTime minutes"    
+  fi
+else
+  echo "Running tests with a single maven instance, no parallelization"
+  $mvnCommand -P nonParallelTests test -Dtest=$runList1,$runList2,$flakyTests $args
+  cleanProcess  
+  exeTime=$(((`date +%s` - $startTime)/60))
+  echo "Single maven instance tests executed after $exeTime minutes"     
+fi
+
+#let's analyze the results
+fullRunList="$smallList,$longList"
+
+if (test $runAllTests -eq 1)
+then
+  fullRunList="$fullRunList,$flakyTests"
+fi
+
+#single timestamp to ensure files uniquess.
+timestamp=`date +%s`
+
+#some counters, initialized because they may not be touched
+# in the loop
+errorCounter=0
+sucessCounter=0
+notFinishedCounter=0
+
+for testClass in `echo $fullRunList | sed 's/,/ /g'`
+do
+  reportFile=$surefireReportDirectory/$testClass.txt
+  outputReportFile=$surefireReportDirectory/$testClass-output.txt
+  
+  if [ -s $reportFile ];
+  then
+    isError=`grep FAILURE $reportFile | wc -l`
+    if (test $isError -gt 0)
+    then
+      errorList="$errorList,$testClass"
+      errorCounter=$(($errorCounter + 1))
+      
+      #let's copy the files if we want to use it later      
+      cp $reportFile "$surefireReportDirectory/fail_$timestamp.$testClass.txt"
+      if [ -s $reportFile ];
+      then
+        cp $outputReportFile "$surefireReportDirectory/fail_$timestamp.$testClass"-output.txt""
+      fi
+    else
+     
+      sucessCounter=$(($sucessCounter +1))
+    fi  
+  else
+     #report file does not exist or is empty => the test didn't finish
+     notFinishedCounter=$(($notFinishedCounter + 1))
+     notFinishedList="$notFinishedList,$testClass"
+  fi  
+done
+
+#list of all tests that failed
+replayList="$notFinishedList""$errorList"
+
+#remove the ',' at the beginning
+notFinishedList=${notFinishedList:1:${#notFinishedList}}
+errorList=${errorList:1:${#errorList}}
+replayList=${replayList:1:${#replayList}}
+
+#make it simpler to read by removing the org.* stuff from the name
+notFinishedPresList=`echo $notFinishedList | sed 's/org.apache.hadoop.hbase.//g' | sed 's/,/, /g'`
+errorPresList=`echo $errorList | sed 's/org.apache.hadoop.hbase.//g' | sed 's/,/, /g'`
+
+
+#calculate the execution time
+curTime=`date +%s`
+exeTime=$((($curTime - $startTime)/60))
+
+echo "##########################"
+echo "$sucessCounter tests executed successfully"
+echo "$errorCounter tests are in error"
+echo "$notFinishedCounter tests didn't finish"
+echo
+echo "Tests in error are: $errorPresList"
+echo "Tests that didn't finish are: $notFinishedPresList"
+echo
+echo "Execution time in minutes: $exeTime" 
+echo "##########################"
+
+
+if (test ${#replayList} -gt 0)
+then
+  if (test $replayFailed -gt 0)
+  then
+    echo "Replaying all tests that failed"
+    $mvnCommand -P nonParallelTests test -Dtest=$replayList  $args
+    echo "Replaying done"
+  fi
+fi
+
+exit

Added: hbase/trunk/src/test/java/org/apache/hadoop/hbase/LargeTests.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/LargeTests.java?rev=1199604&view=auto
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/LargeTests.java (added)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/LargeTests.java Wed Nov  9 03:38:10 2011
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2011 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hbase;
+
+/**
+ * Tag a test as 'large', meaning that the test class has the following
+ * characteristics:
+ *  - executed in an isolated JVM. Tests can however be executed in different
+ *    JVM on the same machine simultaneously.
+ *  - will not have to be executed by the developer before submitting a bug
+ *  - ideally, last less than 2 minutes to help parallelization
+ *
+ *  It the worst case compared to small or medium, use it only for tests that
+ *    you cannot put in the other categories
+ *
+ * @see SmallTests
+ * @see MediumTests
+ */
+public interface LargeTests {
+}

Added: hbase/trunk/src/test/java/org/apache/hadoop/hbase/MediumTests.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/MediumTests.java?rev=1199604&view=auto
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/MediumTests.java (added)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/MediumTests.java Wed Nov  9 03:38:10 2011
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2011 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hbase;
+
+/**
+ * Tag a test as 'Medium', meaning that the test class has the following
+ * characteristics:
+ *  - executed in an isolated JVM. Tests can however be executed in different
+ *    JVM on the same machine simultaneously.
+ *  - will have to be executed by the developer before submitting a bug
+ *  - ideally, last less than 1 minutes to help parallelization
+ *
+ *  Use it for tests that cannot be tagged as 'Small'.
+ *
+ * @see SmallTests
+ * @see LargeTests
+ */
+public interface MediumTests {
+}

Added: hbase/trunk/src/test/java/org/apache/hadoop/hbase/SmallTests.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/SmallTests.java?rev=1199604&view=auto
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/SmallTests.java (added)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/SmallTests.java Wed Nov  9 03:38:10 2011
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hbase;
+
+/**
+ * Tag a test as 'small', meaning that the test class has the following
+ * characteristics:
+ *  - can be run simultaneously with other small tests in the same JVM
+ *  - ideally, last less than 15 seconds
+ *  - does not use a cluster
+ *
+ * @see MediumTests
+ * @see LargeTests
+ */
+public interface SmallTests {
+}

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java Wed Nov  9 03:38:10 2011
@@ -40,6 +40,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import com.google.common.collect.Lists;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test case that uses multiple threads to read and write multifamily rows
@@ -48,6 +49,7 @@ import com.google.common.collect.Lists;
  * This can run as a junit test, or with a main() function which runs against
  * a real cluster (eg for testing with failures, region movement, etc)
  */
+@Category(MediumTests.class)
 public class TestAcidGuarantees {
   protected static final Log LOG = LogFactory.getLog(TestAcidGuarantees.class);
   public static final byte [] TABLE_NAME = Bytes.toBytes("TestAcidGuarantees");

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java Wed Nov  9 03:38:10 2011
@@ -39,11 +39,13 @@ import org.apache.zookeeper.KeeperExcept
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test the draining servers feature.
  * @see <a href="https://issues.apache.org/jira/browse/HBASE-4298">HBASE-4298</a>
  */
+@Category(MediumTests.class)
 public class TestDrainingServer {
   private static final Log LOG = LogFactory.getLog(TestDrainingServer.class);
   private static final HBaseTestingUtility TEST_UTIL =

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java Wed Nov  9 03:38:10 2011
@@ -33,7 +33,9 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+@Category(LargeTests.class)
 public class TestFullLogReconstruction {
 
   private final static HBaseTestingUtility

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java Wed Nov  9 03:38:10 2011
@@ -34,11 +34,13 @@ import org.apache.hadoop.hbase.util.Byte
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
 import org.apache.hadoop.hbase.util.Threads;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test HBASE-3694 whether the GlobalMemStoreSize is the same as the summary
  * of all the online region's MemStoreSize
  */
+@Category(MediumTests.class)
 public class TestGlobalMemStoreSize {
   private final Log LOG = LogFactory.getLog(this.getClass().getName());
   private static int regionServerNum = 4;

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java Wed Nov  9 03:38:10 2011
@@ -43,10 +43,12 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test our testing utility class
  */
+@Category(LargeTests.class)
 public class TestHBaseTestingUtility {
   private final Log LOG = LogFactory.getLog(this.getClass());
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java Wed Nov  9 03:38:10 2011
@@ -29,12 +29,15 @@ import org.apache.hadoop.hbase.client.HT
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import static org.junit.Assert.assertTrue;
 
 /**
  * Testing, info servers are disabled.  This test enables then and checks that
  * they serve pages.
  */
+@Category(MediumTests.class)
 public class TestInfoServers {
   static final Log LOG = LogFactory.getLog(TestInfoServers.class);
   private final static HBaseTestingUtility UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java Wed Nov  9 03:38:10 2011
@@ -46,11 +46,13 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Port of old TestScanMultipleVersions, TestTimestamp and TestGetRowVersions
  * from old testing framework to {@link HBaseTestingUtility}.
  */
+@Category(MediumTests.class)
 public class TestMultiVersions {
   private static final Log LOG = LogFactory.getLog(TestMultiVersions.class);
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
@@ -318,4 +320,4 @@ public class TestMultiVersions {
       s.close();
     }
   }
-}
\ No newline at end of file
+}

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java Wed Nov  9 03:38:10 2011
@@ -39,10 +39,12 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test whether region rebalancing works. (HBASE-71)
  */
+@Category(LargeTests.class)
 public class TestRegionRebalancing {
   final Log LOG = LogFactory.getLog(this.getClass().getName());
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
@@ -214,4 +216,4 @@ public class TestRegionRebalancing {
       } catch (InterruptedException e) {}
     }
   }
-}
\ No newline at end of file
+}

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java Wed Nov  9 03:38:10 2011
@@ -50,7 +50,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+@Category(LargeTests.class)
 public class TestZooKeeper {
   private final Log LOG = LogFactory.getLog(this.getClass());
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java Wed Nov  9 03:38:10 2011
@@ -27,6 +27,7 @@ import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericArray;
 import org.apache.avro.generic.GenericData;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.MediumTests;
 import org.apache.hadoop.hbase.avro.generated.AColumn;
 import org.apache.hadoop.hbase.avro.generated.AColumnValue;
 import org.apache.hadoop.hbase.avro.generated.AFamilyDescriptor;
@@ -40,11 +41,13 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Unit testing for AvroServer.HBaseImpl, a part of the
  * org.apache.hadoop.hbase.avro package.
  */
+@Category(MediumTests.class)
 public class TestAvroServer {
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java Wed Nov  9 03:38:10 2011
@@ -31,14 +31,7 @@ import junit.framework.Assert;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.Abortable;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.NotAllMetaRegionsOnlineException;
-import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HConnection;
 import org.apache.hadoop.hbase.client.HConnectionManager;
@@ -58,12 +51,14 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
 /**
  * Test {@link CatalogTracker}
  */
+@Category(MediumTests.class)
 public class TestCatalogTracker {
   private static final Log LOG = LogFactory.getLog(TestCatalogTracker.class);
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
@@ -410,4 +405,4 @@ public class TestCatalogTracker {
       this.ct.waitForRoot();
     }
   }
-}
\ No newline at end of file
+}

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java Wed Nov  9 03:38:10 2011
@@ -21,15 +21,15 @@ package org.apache.hadoop.hbase.catalog;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.Abortable;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Do {@link CatalogTracker} tests on running cluster.
  */
+@Category(LargeTests.class)
 public class TestCatalogTrackerOnCluster {
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
   private static final Log LOG =

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java Wed Nov  9 03:38:10 2011
@@ -31,11 +31,7 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.Abortable;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -45,10 +41,12 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test {@link MetaReader}, {@link MetaEditor}, and {@link RootLocationEditor}.
  */
+@Category(MediumTests.class)
 public class TestMetaReaderEditor {
   private static final Log LOG = LogFactory.getLog(TestMetaReaderEditor.class);
   private static final  HBaseTestingUtility UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java Wed Nov  9 03:38:10 2011
@@ -26,13 +26,7 @@ import java.util.NavigableMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.Abortable;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HConnection;
 import org.apache.hadoop.hbase.client.HConnectionManager;
 import org.apache.hadoop.hbase.client.HConnectionTestingUtility;
@@ -45,12 +39,14 @@ import org.apache.hadoop.hbase.zookeeper
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.mockito.Mockito;
 
 /**
  * Test MetaReader/Editor but without spinning up a cluster.
  * We mock regionserver back and forth (we do spin up a zk cluster).
  */
+@Category(MediumTests.class)
 public class TestMetaReaderEditorNoCluster {
   private static final Log LOG = LogFactory.getLog(TestMetaReaderEditorNoCluster.class);
   private static final  HBaseTestingUtility UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Wed Nov  9 03:38:10 2011
@@ -39,17 +39,7 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.NotServingRegionException;
-import org.apache.hadoop.hbase.TableExistsException;
-import org.apache.hadoop.hbase.TableNotDisabledException;
-import org.apache.hadoop.hbase.TableNotEnabledException;
-import org.apache.hadoop.hbase.TableNotFoundException;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.executor.EventHandler;
 import org.apache.hadoop.hbase.executor.EventHandler.EventType;
 import org.apache.hadoop.hbase.executor.ExecutorService;
@@ -62,6 +52,7 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 
 /**
@@ -69,6 +60,7 @@ import org.junit.Test;
  * Spins up the minicluster once at test start and then takes it down afterward.
  * Add any testing of HBaseAdmin functionality here.
  */
+@Category(LargeTests.class)
 public class TestAdmin {
   final Log LOG = LogFactory.getLog(getClass());
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java Wed Nov  9 03:38:10 2011
@@ -48,13 +48,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.filter.BinaryComparator;
 import org.apache.hadoop.hbase.filter.CompareFilter;
 import org.apache.hadoop.hbase.filter.Filter;
@@ -80,12 +74,14 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Run tests that use the HBase clients; {@link HTable} and {@link HTablePool}.
  * Sets up the HBase mini cluster once at start and runs through all client tests.
  * Each creates a table named for the method and does its stuff against that.
  */
+@Category(LargeTests.class)
 public class TestFromClientSide {
   final Log LOG = LogFactory.getLog(getClass());
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java Wed Nov  9 03:38:10 2011
@@ -34,20 +34,18 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.ZooKeeperConnectionException;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * This class is for testing HCM features
  */
+@Category(MediumTests.class)
 public class TestHCM {
   private static final Log LOG = LogFactory.getLog(TestHCM.class);
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java Wed Nov  9 03:38:10 2011
@@ -25,13 +25,11 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.PoolMap.PoolType;
 import org.junit.*;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -40,6 +38,7 @@ import org.junit.runners.Suite;
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({TestHTablePool.TestHTableReusablePool.class, TestHTablePool.TestHTableThreadLocalPool.class})
+@Category(MediumTests.class)
 public class TestHTablePool {
 	private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
 	private final static byte[] TABLENAME = Bytes.toBytes("TestHTablePool");

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java Wed Nov  9 03:38:10 2011
@@ -27,15 +27,18 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.MediumTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * This class provides tests for the {@link HTableUtil} class
  *
  */
+@Category(MediumTests.class)
 public class TestHTableUtil {
   final Log LOG = LogFactory.getLog(getClass());
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java Wed Nov  9 03:38:10 2011
@@ -38,11 +38,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.FsShell;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.catalog.CatalogTracker;
 import org.apache.hadoop.hbase.catalog.MetaMigrationRemovingHTD;
 import org.apache.hadoop.hbase.catalog.MetaReader;
@@ -52,11 +48,13 @@ import org.apache.hadoop.hbase.util.Writ
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test migration that removes HTableDescriptor from HRegionInfo moving the
  * meta version from no version to {@link MetaReader#META_VERSION}.
  */
+@Category(MediumTests.class)
 public class TestMetaMigrationRemovingHTD {
   static final Log LOG = LogFactory.getLog(TestMetaMigrationRemovingHTD.class);
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java Wed Nov  9 03:38:10 2011
@@ -22,15 +22,16 @@ package org.apache.hadoop.hbase.client;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.mockito.Mockito.*;
 
+@Category(MediumTests.class)
 public class TestMetaScanner {
   final Log LOG = LogFactory.getLog(getClass());
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java Wed Nov  9 03:38:10 2011
@@ -27,8 +27,7 @@ import java.util.concurrent.ThreadPoolEx
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
 import org.junit.AfterClass;
@@ -36,9 +35,11 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.*;
 
+@Category(MediumTests.class)
 public class TestMultiParallel {
   private static final Log LOG = LogFactory.getLog(TestMultiParallel.class);
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java Wed Nov  9 03:38:10 2011
@@ -28,20 +28,21 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Run tests related to {@link TimestampsFilter} using HBase client APIs.
  * Sets up the HBase mini cluster once at start. Each creates a table
  * named for the method and does its stuff against that.
  */
+@Category(LargeTests.class)
 public class TestMultipleTimestamps {
   final Log LOG = LogFactory.getLog(getClass());
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java Wed Nov  9 03:38:10 2011
@@ -25,8 +25,7 @@ import static org.junit.Assert.fail;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.catalog.MetaReader;
 import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -34,10 +33,12 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Test various scanner timeout issues.
  */
+@Category(LargeTests.class)
 public class TestScannerTimeout {
 
   private final static HBaseTestingUtility

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestShell.java Wed Nov  9 03:38:10 2011
@@ -27,17 +27,16 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.LargeTests;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import org.jruby.embed.ScriptingContainer;
 import org.jruby.embed.PathType;
+import org.junit.experimental.categories.Category;
 
-/**
- *
- * @author scoundrel
- */
+@Category(LargeTests.class)
 public class TestShell {
   final Log LOG = LogFactory.getLog(getClass());
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java Wed Nov  9 03:38:10 2011
@@ -28,8 +28,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.TimestampsFilter;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -38,12 +37,14 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Run tests related to {@link TimestampsFilter} using HBase client APIs.
  * Sets up the HBase mini cluster once at start. Each creates a table
  * named for the method and does its stuff against that.
  */
+@Category(MediumTests.class)
 public class TestTimestampsFilter {
   final Log LOG = LogFactory.getLog(getClass());
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java Wed Nov  9 03:38:10 2011
@@ -24,12 +24,11 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.Stoppable;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.fail;
 import static org.junit.Assert.assertEquals;
@@ -37,6 +36,7 @@ import static org.junit.Assert.assertEqu
 /**
  * Unit testing of ReplicationAdmin
  */
+@Category(MediumTests.class)
 public class TestReplicationAdmin {
 
   private static final Log LOG =

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java Wed Nov  9 03:38:10 2011
@@ -24,9 +24,7 @@ import static org.junit.Assert.assertEqu
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Scan;
@@ -38,11 +36,13 @@ import org.apache.hadoop.hbase.util.Byte
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * A test class to cover aggregate functions, that can be implemented using
  * Coprocessors.
  */
+@Category(MediumTests.class)
 public class TestAggregateProtocol {
   protected static Log myLog = LogFactory.getLog(TestAggregateProtocol.class);
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java Wed Nov  9 03:38:10 2011
@@ -23,17 +23,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HServerLoad;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
-import org.apache.hadoop.hbase.CoprocessorEnvironment;
-import org.apache.hadoop.hbase.Coprocessor;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.TableNotEnabledException;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -45,6 +37,7 @@ import java.util.Arrays;
 import java.util.jar.*;
 
 import org.junit.*;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -53,6 +46,7 @@ import static org.junit.Assert.assertFal
 /**
  * Test coprocessors class loading.
  */
+@Category(MediumTests.class)
 public class TestClassLoading {
   private static final Log LOG = LogFactory.getLog(TestClassLoading.class);
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java Wed Nov  9 03:38:10 2011
@@ -26,9 +26,7 @@ import java.io.IOException;
 import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Scan;
@@ -38,10 +36,12 @@ import org.apache.hadoop.io.Text;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * TestEndpoint: test cases to verify coprocessor Endpoint
  */
+@Category(MediumTests.class)
 public class TestCoprocessorEndpoint {
 
   private static final byte[] TEST_TABLE = Bytes.toBytes("TestTable");

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java Wed Nov  9 03:38:10 2011
@@ -24,14 +24,8 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.Abortable;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.master.HMaster;
 import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -40,6 +34,8 @@ import org.apache.hadoop.hbase.zookeeper
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import static org.junit.Assert.*;
 
 /**
@@ -48,6 +44,7 @@ import static org.junit.Assert.*;
  * error message describing the set of its loaded coprocessors for crash diagnosis.
  * (HBASE-4014).
  */
+@Category(MediumTests.class)
 public class TestMasterCoprocessorExceptionWithAbort {
 
   public static class MasterTracker extends ZooKeeperNodeTracker {

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java Wed Nov  9 03:38:10 2011
@@ -24,14 +24,8 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.Abortable;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.master.HMaster;
 import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -40,6 +34,8 @@ import org.apache.hadoop.hbase.zookeeper
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import static org.junit.Assert.*;
 
 /**
@@ -49,6 +45,7 @@ import static org.junit.Assert.*;
  * back to the client.
  * (HBASE-4014).
  */
+@Category(MediumTests.class)
 public class TestMasterCoprocessorExceptionWithRemove {
 
   public static class MasterTracker extends ZooKeeperNodeTracker {

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java Wed Nov  9 03:38:10 2011
@@ -34,14 +34,7 @@ import java.util.NavigableMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.CoprocessorEnvironment;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
-import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.master.AssignmentManager;
@@ -52,11 +45,13 @@ import org.apache.hadoop.hbase.util.Byte
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 /**
  * Tests invocation of the {@link org.apache.hadoop.hbase.coprocessor.MasterObserver}
  * interface hooks at all appropriate times during normal HMaster operations.
  */
+@Category(MediumTests.class)
 public class TestMasterObserver {
   private static final Log LOG = LogFactory.getLog(TestMasterObserver.class);
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java Wed Nov  9 03:38:10 2011
@@ -25,9 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HTable;
@@ -42,9 +40,11 @@ import org.apache.hadoop.hbase.util.Byte
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.assertEquals;
 
+@Category(MediumTests.class)
 public class TestRegionObserverBypass {
   private static HBaseTestingUtility util;
   private static final byte[] tableName = Bytes.toBytes("test");

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java Wed Nov  9 03:38:10 2011
@@ -29,13 +29,7 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.Coprocessor;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.*;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.InternalScanner;
@@ -49,9 +43,11 @@ import org.apache.hadoop.hbase.util.JVMC
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.*;
 
+@Category(MediumTests.class)
 public class TestRegionObserverInterface {
   static final Log LOG = LogFactory.getLog(TestRegionObserverInterface.class);
   static final String DIR = "test/build/data/TestRegionObserver/";

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java Wed Nov  9 03:38:10 2011
@@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.regionser
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.*;
 
@@ -41,6 +42,7 @@ import static org.junit.Assert.*;
  * error message describing the set of its loaded coprocessors for crash
  * diagnosis. (HBASE-4014).
  */
+@Category(MediumTests.class)
 public class TestRegionServerCoprocessorExceptionWithAbort {
   private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java Wed Nov  9 03:38:10 2011
@@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.regionser
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import static org.junit.Assert.*;
 
@@ -43,6 +44,7 @@ import static org.junit.Assert.*;
  * back to the client.
  * (HBASE-4014).
  */
+@Category(MediumTests.class)
 public class TestRegionServerCoprocessorExceptionWithRemove {
   public static class BuggyRegionObserver extends SimpleRegionObserver {
     @SuppressWarnings("null")

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java Wed Nov  9 03:38:10 2011
@@ -25,15 +25,8 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.Coprocessor;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.regionserver.wal.HLog;
 import org.apache.hadoop.hbase.regionserver.wal.HLogSplitter;
@@ -49,6 +42,7 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
 import java.security.PrivilegedExceptionAction;
@@ -62,6 +56,7 @@ import static org.junit.Assert.*;
  * Tests invocation of the {@link org.apache.hadoop.hbase.coprocessor.MasterObserver}
  * interface hooks at all appropriate times during normal HMaster operations.
  */
+@Category(MediumTests.class)
 public class TestWALObserver {
   private static final Log LOG = LogFactory.getLog(TestWALObserver.class);
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java Wed Nov  9 03:38:10 2011
@@ -29,12 +29,7 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.KeyValueTestUtil;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
@@ -48,6 +43,8 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.experimental.categories.Category;
+
 
 class StringRange {
   private String start = null;
@@ -118,6 +115,7 @@ class StringRange {
   }
 }
 
+@Category(MediumTests.class)
 public class TestColumnRangeFilter {
 
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java?rev=1199604&r1=1199603&r2=1199604&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java Wed Nov  9 03:38:10 2011
@@ -32,13 +32,13 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.regionserver.StoreFile;
 import org.apache.hadoop.hbase.util.BloomFilterFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -49,6 +49,7 @@ import static org.junit.Assert.*;
  * types: data blocks, non-root index blocks, and Bloom filter blocks.
  */
 @RunWith(Parameterized.class)
+@Category(MediumTests.class)
 public class TestCacheOnWrite {
 
   private static final Log LOG = LogFactory.getLog(TestCacheOnWrite.class);



Mime
View raw message