From: Daira Hopwood <daira@jacaranda.org> Date: Fri, 17 Apr 2015 19:37:35 +0000 (+0100) Subject: Rename 'delete_all_shares' to 'empty_sharedir' to avoid name clash. X-Git-Url: https://git.rkrishnan.org/specifications/components?a=commitdiff_plain;h=b1b88e25eedd490714ba15c1a2648b391de98b20;p=tahoe-lafs%2Ftahoe-lafs.git Rename 'delete_all_shares' to 'empty_sharedir' to avoid name clash. Signed-off-by: Daira Hopwood <daira@jacaranda.org> --- diff --git a/src/allmydata/test/no_network.py b/src/allmydata/test/no_network.py index fd25d8d6..98215ddd 100644 --- a/src/allmydata/test/no_network.py +++ b/src/allmydata/test/no_network.py @@ -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': diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py index 090fa3bb..967c18ca 100644 --- a/src/allmydata/test/test_upload.py +++ b/src/allmydata/test/test_upload.py @@ -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