]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
Rename 'delete_all_shares' to 'empty_sharedir' to avoid name clash.
authorDaira Hopwood <daira@jacaranda.org>
Fri, 17 Apr 2015 19:37:35 +0000 (20:37 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Fri, 17 Apr 2015 21:31:02 +0000 (22:31 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/test/no_network.py
src/allmydata/test/test_upload.py

index fd25d8d69a71907c35a794fb35f2ef0aaeb1a886..98215ddda17779c04841e2c90f2daa233618c924 100644 (file)
@@ -404,7 +404,7 @@ class GridTestMixin:
             if i_shnum in shnums:
                 os.unlink(i_sharefile)
 
-    def delete_all_shares(self, serverdir):
+    def empty_sharedir(self, serverdir):
         sharedir = os.path.join(serverdir, "shares")
         for prefixdir in os.listdir(sharedir):
             if prefixdir != 'incoming':
index 090fa3bbe554773ea118a21dc0fc3a0b5bbca81e..967c18ca314784a082f18852202ca1d3ee135b66 100644 (file)
@@ -1887,7 +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)
-            self.delete_all_shares(self.get_serverdir(0))
+            self.empty_sharedir(self.get_serverdir(0))
             client = self.g.clients[0]
             client.encoding_params['happy'] = 4
             return client
@@ -1925,7 +1925,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
             # Copy shares
             self._copy_share_to_server(3, 1)
             #Remove shares from server 0
-            self.delete_all_shares(self.get_serverdir(0))
+            self.empty_sharedir(self.get_serverdir(0))
             client = self.g.clients[0]
             client.encoding_params['happy'] = 4
             return client