accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1494368 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/ test/src/main/java/org/apache/accumulo/test/functional/ test...
Date Tue, 18 Jun 2013 23:19:46 GMT
Author: billie
Date: Tue Jun 18 23:19:46 2013
New Revision: 1494368

URL: http://svn.apache.org/r1494368
Log:
ACCUMULO-1520 misc functional test fixes - merge to trunk

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/pom.xml   (props changed)
    accumulo/trunk/proxy/README   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
    accumulo/trunk/test/system/auto/TestUtils.py
    accumulo/trunk/test/system/auto/simple/examples.py

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

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

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

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

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:r1494361

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:r1494361

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1494361

Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/proxy/README:r1494361

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

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

Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1494368&r1=1494367&r2=1494368&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
(original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
Tue Jun 18 23:19:46 2013
@@ -97,7 +97,7 @@ public class LargeRowTest extends Functi
     
     UtilWaitThread.sleep(12000);
     Logger.getLogger(LargeRowTest.class).warn("checking splits");
-    checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS * 2);
+    checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS * 4);
     
     verify(REG_TABLE_NAME);
   }

Modified: accumulo/trunk/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/TestUtils.py?rev=1494368&r1=1494367&r2=1494368&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/TestUtils.py (original)
+++ accumulo/trunk/test/system/auto/TestUtils.py Tue Jun 18 23:19:46 2013
@@ -457,6 +457,8 @@ class TestUtilsMixin:
         out,err = handle.communicate()
         self.assert_(handle.returncode==0)
         for line in out.split('\n') :
+            if line.find("=>") < 0:
+                continue
             left, right = line.split("=>")
             left = left.strip()
             right = right.strip()

Modified: accumulo/trunk/test/system/auto/simple/examples.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/examples.py?rev=1494368&r1=1494367&r2=1494368&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/simple/examples.py (original)
+++ accumulo/trunk/test/system/auto/simple/examples.py Tue Jun 18 23:19:46 2013
@@ -78,14 +78,14 @@ class Examples(TestUtilsMixin, unittest.
                      '--dataTable', 'dataTable',
                      '--vis', visibility,
                      '--chunkSize', 100000,
-                     ACCUMULO_HOME+"/fate")
+                     ACCUMULO_HOME+"/test")
         self.comment("  searching for a file")
         handle = self.runOn('localhost', [self.accumulo_sh(), 'org.apache.accumulo.examples.simple.dirlist.QueryUtil',
                                           '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-u', ROOT,
'-p', ROOT_PASSWORD,
-                                          '-t', 'indexTable', '--auths', auths, '--search',
'--path', 'Fate.java'])
+                                          '-t', 'indexTable', '--auths', auths, '--search',
'--path', 'examples.py'])
         out, err = handle.communicate()
         self.assert_(handle.returncode == 0)
-        self.assert_(out.find('accumulo/fate/Fate.java') >= 0)
+        self.assert_(out.find('test/system/auto/simple/examples.py') >= 0)
         self.comment("  found file at " + out)
 
     



Mime
View raw message