Merge pull request #341 from tevino/harder-harness

ignore error when removing directory
python-zk · Jun 19, 2015 · 6878989 · 6878989
2 parents 8511483 + c7c6d06
commit 6878989
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/kazoo/testing/common.py b/kazoo/testing/common.py
@@ -223,7 +223,7 @@ def client_port(self):
     def reset(self):
         """Stop the zookeeper instance, cleaning out its on disk-data."""
         self.stop()
-        shutil.rmtree(os.path.join(self.working_path, "data"))
+        shutil.rmtree(os.path.join(self.working_path, "data"), True)
         os.mkdir(os.path.join(self.working_path, "data"))
         with open(os.path.join(self.working_path, "data", "myid"), "w") as fh:
             fh.write(str(self.server_info.server_id))
@@ -247,7 +247,7 @@ def destroy(self):
         import shutil
         self.stop()
 
-        shutil.rmtree(self.working_path)
+        shutil.rmtree(self.working_path, True)
 
 
 class ZookeeperCluster(object):