accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1461746 - in /accumulo/branches/1.5: proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
Date Wed, 27 Mar 2013 17:58:01 GMT
Author: ecn
Date: Wed Mar 27 17:58:01 2013
New Revision: 1461746

URL: http://svn.apache.org/r1461746
Log:
ACCUMULO-1215 hide the parallelWriteSpeed method from old-style junit TestCase

Modified:
    accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
    accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java

Modified: accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1461746&r1=1461745&r2=1461746&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original)
+++ accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Wed
Mar 27 17:58:01 2013
@@ -214,7 +214,7 @@ public class SimpleTest {
     assertFalse(scans.isEmpty());
     ActiveScan scan = scans.get(0);
     assertEquals("root", scan.getUser());
-    assertEquals(ScanState.RUNNING, scan.getState());
+    assertTrue(ScanState.RUNNING.equals(scan.getState()) || ScanState.QUEUED.equals(scan.getState()));
     assertEquals(ScanType.SINGLE, scan.getType());
     assertEquals("slow", scan.getTable());
     Map<String,String> map = client.tableIdMap(creds);

Modified: accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java?rev=1461746&r1=1461745&r2=1461746&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
(original)
+++ accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
Wed Mar 27 17:58:01 2013
@@ -307,7 +307,7 @@ public class InMemoryMapTest extends Tes
   }
   
   // @Test - hard to get this timing test to run well on apache build machines
-  public void testParallelWriteSpeed() throws InterruptedException {
+  public void parallelWriteSpeed() throws InterruptedException {
     List<Double> timings = new ArrayList<Double>();
     for (int threads: new int[]{1, 2, 16, /* 64, 256*/} ) {
       final long now = System.currentTimeMillis();



Mime
View raw message