From: Mark Berger <mark.berger.j@gmail.com>
Date: Mon, 24 Jun 2013 22:30:26 +0000 (-0400)
Subject: Fixes tests which were improperly deleting shares
X-Git-Tag: allmydata-tahoe-1.10.1a1~148^2~1
X-Git-Url: https://git.rkrishnan.org/module-simplejson-index.html?a=commitdiff_plain;h=e594f2b1abb19a7dcda90bb4b28e94499c5fc6f2;p=tahoe-lafs%2Ftahoe-lafs.git

Fixes tests which were improperly deleting shares
---

diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py
index b6ca3bbf..865eec28 100644
--- a/src/allmydata/test/test_upload.py
+++ b/src/allmydata/test/test_upload.py
@@ -1887,11 +1887,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
             self._add_server_with_share(server_number=3, share_number=1)
             # Copy shares
             self._copy_share_to_server(3, 1)
-            storedir = self.get_serverdir(0)
-            # remove the storedir, wiping out any existing shares
-            shutil.rmtree(storedir)
-            # create an empty storedir to replace the one we just removed
-            os.mkdir(storedir)
+            self.delete_all_shares(self.get_serverdir(0))
             client = self.g.clients[0]
             client.encoding_params['happy'] = 4
             return client
@@ -1929,10 +1925,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
             # Copy shares
             self._copy_share_to_server(3, 1)
             #Remove shares from server 0
-            sharedir = os.path.join(self.get_serverdir(0), "shares")
-            for prefixdir in os.listdir(sharedir):
-                if prefixdir != 'incoming':
-                    fileutil.rm_dir(os.path.join(sharedir, prefixdir))
+            self.delete_all_shares(self.get_serverdir(0))
             client = self.g.clients[0]
             client.encoding_params['happy'] = 4
             return client