Author: billie
Date: Tue Jun 18 22:52:04 2013
New Revision: 1494361
URL: http://svn.apache.org/r1494361
Log:
ACCUMULO-1520 misc functional test fixes
Modified:
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
accumulo/branches/1.5/test/system/auto/TestUtils.py
accumulo/branches/1.5/test/system/auto/simple/examples.py
Modified:
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1494361&r1=1494360&r2=1494361&view=diff
==============================================================================
---
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
(original)
+++
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
Tue Jun 18 22:52:04 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);
+ checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS/2, NUM_PRE_SPLITS * 4);
verify(REG_TABLE_NAME);
}
Modified: accumulo/branches/1.5/test/system/auto/TestUtils.py
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/auto/TestUtils.py?rev=1494361&r1=1494360&r2=1494361&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/auto/TestUtils.py (original)
+++ accumulo/branches/1.5/test/system/auto/TestUtils.py Tue Jun 18 22:52:04 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/branches/1.5/test/system/auto/simple/examples.py
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/auto/simple/examples.py?rev=1494361&r1=1494360&r2=1494361&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/auto/simple/examples.py (original)
+++ accumulo/branches/1.5/test/system/auto/simple/examples.py Tue Jun 18
22:52:04 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)
