accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1459749 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/src/test/java/org/apache/accumulo/test/
Date Fri, 22 Mar 2013 12:48:32 GMT
Author: ecn
Date: Fri Mar 22 12:48:31 2013
New Revision: 1459749

URL: http://svn.apache.org/r1459749
Log:
ACCUMULO-581 fixed a couple of shell tests

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1459747

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1459747

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1459747

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1459747

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1459747

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1459747

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1459747

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1459747

Modified: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java?rev=1459749&r1=1459748&r2=1459749&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java (original)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java Fri Mar
22 12:48:31 2013
@@ -329,15 +329,15 @@ public class ShellServerTest {
   public void clonetable() throws Exception {
     // clonetable
     exec("createtable orig -evc");
-    exec("config -t orig -s table.split.threshold=123M");
-    exec("addsplit -t orig a b c");
+    exec("config -t orig -s table.split.threshold=123M", true);
+    exec("addsplits -t orig a b c", true);
     exec("insert a b c value");
     exec("scan", true, "value", true);
     exec("clonetable orig clone");
     // verify constraint, config, and splits were cloned
     exec("constraint --list -t clone", true, "VisibilityConstraint=1", true);
     exec("config -t clone -np", true, "123M", true);
-    String out = exec("getsplits -t clone"); // , true, "a\nb\nc\n");
+    exec("getsplits -t clone", true, "a\nb\nc\n");
     // compact
     exec("createtable c");
     // make two files
@@ -365,9 +365,9 @@ public class ShellServerTest {
     exec("merge --all -t c");
     exec("compact -w");
     assertTrue(countFiles() == oldCount - 3);
-    exec("deletetable orig");
-    exec("deletetable clone");
-    exec("deletetable c");
+    exec("deletetable -f orig");
+    exec("deletetable -f clone");
+    exec("deletetable -f c");
   }
   
   @Test(timeout = 30000)
@@ -619,6 +619,7 @@ public class ShellServerTest {
     exec("sleep 10");
     System.out.println(exec("scan -np"));
     UtilWaitThread.sleep(60*1000);
+    exec("deletetable -f t");
   }
   
   private int countkeys(String table) throws IOException {
@@ -634,7 +635,6 @@ public class ShellServerTest {
   
   private int countFiles() throws IOException {
     exec("scan -t !METADATA -np -c file");
-    // System.out.println(output.get());
     return output.get().split("\n").length - 1;
   }
   



Mime
View raw message