accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1500880 - in /accumulo/trunk: ./ 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/
Date Mon, 08 Jul 2013 18:49:34 GMT
Author: ecn
Date: Mon Jul  8 18:49:34 2013
New Revision: 1500880

URL: http://svn.apache.org/r1500880
Log:
ACCUMULO-1557 applying Jonathan Hsieh's patch

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml   (props changed)
    accumulo/trunk/proxy/README   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/system/auto/simple/zooCacheTest.py

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1500878
  Merged /accumulo/branches/1.4:r1500876

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/assemble:r1500876
  Merged /accumulo/branches/1.5/assemble:r1500878

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1500878
  Merged /accumulo/branches/1.4/core:r1500876

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/examples:r1500876
  Merged /accumulo/branches/1.5/examples:r1500878

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1500878
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1500876

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1500878
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1500876

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1500878

Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/proxy/README:r1500876
  Merged /accumulo/branches/1.5/proxy/README:r1500878

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1500876
  Merged /accumulo/branches/1.5/server:r1500878

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1500876
  Merged /accumulo/branches/1.5/src:r1500878

Modified: accumulo/trunk/test/system/auto/simple/zooCacheTest.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/zooCacheTest.py?rev=1500880&r1=1500879&r2=1500880&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/simple/zooCacheTest.py (original)
+++ accumulo/trunk/test/system/auto/simple/zooCacheTest.py Mon Jul  8 18:49:34 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])



Mime
View raw message