ACCUMULO-1829 merge 1.4 -> 1.5
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1096fbb9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1096fbb9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1096fbb9 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 1096fbb9a8fed8ad207169491f265fc810fc64a1 Parents: 806f00e 41efe1a Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Nov 7 13:48:49 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Nov 7 13:48:49 2013 -0500 ---------------------------------------------------------------------- test/system/auto/simple/zooCacheTest.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1096fbb9/test/system/auto/simple/zooCacheTest.py ---------------------------------------------------------------------- diff --cc test/system/auto/simple/zooCacheTest.py index 6bda870,b9beacb..07190bb --- a/test/system/auto/simple/zooCacheTest.py +++ b/test/system/auto/simple/zooCacheTest.py @@@ -31,13 -32,13 +32,13 @@@ class ZooCacheTest(TestUtilsMixin, unit def runTest(self): 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.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) + 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 * self.timeout_factor) self.waitForStop(handleR1, 1) self.waitForStop(handleR2, 1) self.waitForStop(handleR3, 1)
