You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/07/08 20:48:45 UTC
svn commit: r1500878 - in /accumulo/branches/1.5: ./ assemble/ core/
examples/ fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/
test/system/auto/simple/
Author: ecn
Date: Mon Jul 8 18:48:45 2013
New Revision: 1500878
URL: http://svn.apache.org/r1500878
Log:
ACCUMULO-1557 applying Jonathan Hsieh's patch
Modified:
accumulo/branches/1.5/ (props changed)
accumulo/branches/1.5/assemble/ (props changed)
accumulo/branches/1.5/core/ (props changed)
accumulo/branches/1.5/examples/ (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/branches/1.5/proxy/README (props changed)
accumulo/branches/1.5/server/ (props changed)
accumulo/branches/1.5/src/ (props changed)
accumulo/branches/1.5/test/system/auto/simple/zooCacheTest.py
Propchange: accumulo/branches/1.5/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4:r1500876
Propchange: accumulo/branches/1.5/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/assemble:r1500876
Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1500876
Propchange: accumulo/branches/1.5/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/examples:r1500876
Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1500876
Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1500876
Propchange: accumulo/branches/1.5/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/proxy/README:r1500876
Propchange: accumulo/branches/1.5/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1500876
Propchange: accumulo/branches/1.5/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1500876
Modified: accumulo/branches/1.5/test/system/auto/simple/zooCacheTest.py
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/auto/simple/zooCacheTest.py?rev=1500878&r1=1500877&r2=1500878&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/auto/simple/zooCacheTest.py (original)
+++ accumulo/branches/1.5/test/system/auto/simple/zooCacheTest.py Mon Jul 8 18:48:45 2013
@@ -14,7 +14,7 @@
# limitations under the License.
import os
-
+import shutil
import unittest
import time
@@ -30,6 +30,7 @@ class ZooCacheTest(TestUtilsMixin, unitt
self.create_config_file(self.settings.copy())
def runTest(self):
+ shutil.rmtree('/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])