ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 23:26:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes tests which were improperly deleting shares

Browse Source
This commit is contained in:
Mark Berger 2013-06-24 18:30:26 -04:00 committed by Brian Warner
parent 2ab6172302
commit e594f2b1ab
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/allmydata/test/test_upload.py
View File

@ -1887,11 +1887,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
self._add_server_with_share(server_number=3, share_number=1) self._add_server_with_share(server_number=3, share_number=1)
# Copy shares # Copy shares
self._copy_share_to_server(3, 1) self._copy_share_to_server(3, 1)
storedir = self.get_serverdir(0) self.delete_all_shares(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)
client = self.g.clients[0] client = self.g.clients[0]
client.encoding_params['happy'] = 4 client.encoding_params['happy'] = 4
return client return client
@ -1929,10 +1925,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
# Copy shares # Copy shares
self._copy_share_to_server(3, 1) self._copy_share_to_server(3, 1)
#Remove shares from server 0 #Remove shares from server 0
sharedir = os.path.join(self.get_serverdir(0), "shares") self.delete_all_shares(self.get_serverdir(0))
for prefixdir in os.listdir(sharedir):
if prefixdir != 'incoming':
fileutil.rm_dir(os.path.join(sharedir, prefixdir))
client = self.g.clients[0] client = self.g.clients[0]
client.encoding_params['happy'] = 4 client.encoding_params['happy'] = 4
return client return client