accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/2] git commit: ACCUMULO-1775 Applying patch from Jessica Seastrom to ignore errors when trying to remove a test directory
Date Tue, 15 Oct 2013 18:26:04 GMT
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT eb54bc2c0 -> 1b05bd8c7


ACCUMULO-1775 Applying patch from Jessica Seastrom to ignore errors when trying to remove
a test directory


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3705acd8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3705acd8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3705acd8

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 3705acd8e4cb3ce994893df3ee8a7f5f9e5e86b4
Parents: 46d11b0
Author: Josh Elser <elserj@apache.org>
Authored: Tue Oct 15 14:22:12 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Oct 15 14:22:12 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/3705acd8/test/system/auto/simple/zooCacheTest.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/zooCacheTest.py b/test/system/auto/simple/zooCacheTest.py
index 040c413..16b30a6 100755
--- a/test/system/auto/simple/zooCacheTest.py
+++ b/test/system/auto/simple/zooCacheTest.py
@@ -30,7 +30,7 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
         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'])
         self.waitForStop(handleCC, 10)
         handleR1 = self.runClassOn('localhost', 'org.apache.accumulo.server.test.functional.CacheTestReader',
['/zcTest-42','/tmp/zcTest-42', ZOOKEEPERS])
@@ -44,6 +44,7 @@ class ZooCacheTest(TestUtilsMixin, unittest.TestCase):
 
     def tearDown(self):
         os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+        shutil.rmtree('/tmp/zcTest-42', ignore_errors=True, onerror=None)
 
 def suite():
     result = unittest.TestSuite()


Mime
View raw message