You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/10/15 20:26:05 UTC
[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/auto/simple/zooCacheTest.py
ACCUMULO-1775
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b05bd8c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b05bd8c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b05bd8c
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1b05bd8c790b7c24ad4067fa160924f2f84c61eb
Parents: eb54bc2 3705acd
Author: Josh Elser <el...@apache.org>
Authored: Tue Oct 15 14:25:15 2013 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Oct 15 14:25:15 2013 -0400
----------------------------------------------------------------------
test/system/auto/simple/zooCacheTest.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b05bd8c/test/system/auto/simple/zooCacheTest.py
----------------------------------------------------------------------
diff --cc test/system/auto/simple/zooCacheTest.py
index fcbb3ab,16b30a6..6bda870
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@@ -30,14 -30,14 +30,14 @@@ class ZooCacheTest(TestUtilsMixin, unit
self.create_config_file(self.settings.copy())
def runTest(self):
- shutil.rmtree('/tmp/zcTest-42')
+ shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
- handleCC = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestClean', ['/zcTest-42','/tmp/zcTest-42'])
+ handleCC = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestClean', ['/zcTest-42','/tmp/zcTest-42'])
self.waitForStop(handleCC, 10)
- handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
- handleW = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
- self.waitForStop(handleW, 120)
+ handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleR2 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleR3 = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestReader', ['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
+ handleW = self.runClassOn('localhost', 'org.apache.accumulo.test.functional.CacheTestWriter', ['/zcTest-42','/tmp/zcTest-42','3','500'])
+ self.waitForStop(handleW, 200)
self.waitForStop(handleR1, 1)
self.waitForStop(handleR2, 1)
self.waitForStop(handleR3, 1)