ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-27 06:39:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up test_storage.py after refactor

Browse Source 
This PR cleans up errorneous changes resulting from
1d85a2c5cf40a4e52bbb024e2edba4fcd883caa1 and adds a
few improvements such as calling `super` implementations.

Making sure classes with functions returning deferreds
use `AsyncTestCase`

Signed-off-by: Fon E. Noel NFEBE <fenn25.fn@gmail.com>
This commit is contained in:
Fon E. Noel NFEBE 2022-11-25 12:15:58 +01:00
parent 1d85a2c5cf
commit 6b0fa64236
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/allmydata/test/test_storage.py
View File

@ -436,7 +436,7 @@ class RemoteBucket(object):
return defer.maybeDeferred(_call) return defer.maybeDeferred(_call)
class BucketProxy(SyncTestCase): class BucketProxy(AsyncTestCase):
def make_bucket(self, name, size): def make_bucket(self, name, size):
basedir = os.path.join("storage", "BucketProxy", name) basedir = os.path.join("storage", "BucketProxy", name)
incoming = os.path.join(basedir, "tmp", "bucket") incoming = os.path.join(basedir, "tmp", "bucket")
@ -563,10 +563,7 @@ class Server(AsyncTestCase):
self.sparent = LoggingServiceParent() self.sparent = LoggingServiceParent()
self.sparent.startService() self.sparent.startService()
self._lease_secret = itertools.count() self._lease_secret = itertools.count()
self.addCleanup(self.sparent.stopService())
def tearDown(self):
super(Server, self).tearDown()
return self.sparent.stopService()
def workdir(self, name): def workdir(self, name):
basedir = os.path.join("storage", "Server", name) basedir = os.path.join("storage", "Server", name)
@ -1284,10 +1281,10 @@ class Server(AsyncTestCase):
class MutableServer(SyncTestCase): class MutableServer(SyncTestCase):
def setUp(self): def setUp(self):
super(MutableServer, self).setUp()
self.sparent = LoggingServiceParent() self.sparent = LoggingServiceParent()
self._lease_secret = itertools.count() self._lease_secret = itertools.count()
def tearDown(self): self.addCleanup(self.sparent.stopService())
return self.sparent.stopService()
def workdir(self, name): def workdir(self, name):
basedir = os.path.join("storage", "MutableServer", name) basedir = os.path.join("storage", "MutableServer", name)
@ -1903,8 +1900,9 @@ class MutableServer(SyncTestCase):
self.assertThat({}, Equals(read_data)) self.assertThat({}, Equals(read_data))
class MDMFProxies(SyncTestCase, ShouldFailMixin): class MDMFProxies(AsyncTestCase, ShouldFailMixin):
def setUp(self): def setUp(self):
super(MDMFProxies, self).setUp()
self.sparent = LoggingServiceParent() self.sparent = LoggingServiceParent()
self._lease_secret = itertools.count() self._lease_secret = itertools.count()
self.ss = self.create("MDMFProxies storage test server") self.ss = self.create("MDMFProxies storage test server")
@ -1935,6 +1933,7 @@ class MDMFProxies(SyncTestCase, ShouldFailMixin):
def tearDown(self): def tearDown(self):
super(MDMFProxies, self).tearDown()
self.sparent.stopService() self.sparent.stopService()
shutil.rmtree(self.workdir("MDMFProxies storage test server")) shutil.rmtree(self.workdir("MDMFProxies storage test server"))
@ -2150,7 +2149,7 @@ class MDMFProxies(SyncTestCase, ShouldFailMixin):
tws[0] = (testvs, [(0, share)], None) tws[0] = (testvs, [(0, share)], None)
readv = [] readv = []
results = write(storage_index, self.secrets, tws, readv) results = write(storage_index, self.secrets, tws, readv)
self.assertFalse(results[0]) self.assertTrue(results[0])
def test_read(self): def test_read(self):
@ -2438,7 +2437,7 @@ class MDMFProxies(SyncTestCase, ShouldFailMixin):
def _check_success(results): def _check_success(results):
self.assertThat(results, HasLength(2)) self.assertThat(results, HasLength(2))
res, d = results res, d = results
self.assertFalse(results) self.assertTrue(results)
mw = self._make_new_mw(b"si1", 0) mw = self._make_new_mw(b"si1", 0)
mw.set_checkstring(b"this is a lie") mw.set_checkstring(b"this is a lie")
@ -2918,7 +2917,7 @@ class MDMFProxies(SyncTestCase, ShouldFailMixin):
d.addCallback(lambda ignored: d.addCallback(lambda ignored:
mr.get_encprivkey()) mr.get_encprivkey())
d.addCallback(lambda encprivkey: d.addCallback(lambda encprivkey:
self.assertThat(encprivkey, self.encprivkey, Equals(encprivkey))) self.assertThat(encprivkey, Equals(self.encprivkey), encprivkey))
d.addCallback(lambda ignored: d.addCallback(lambda ignored:
mr.get_verification_key()) mr.get_verification_key())
d.addCallback(lambda verification_key: d.addCallback(lambda verification_key:
@ -3325,7 +3324,7 @@ class MDMFProxies(SyncTestCase, ShouldFailMixin):
self.assertTrue(results[0]) self.assertTrue(results[0])
read = self.ss.slot_readv read = self.ss.slot_readv
self.assertThat(read(b"si1", [0], [(1, 8)]), self.assertThat(read(b"si1", [0], [(1, 8)]),
{0: [struct.pack(">Q", 1)]}) Equals({0: [struct.pack(">Q", 1)]}))
self.assertThat(read(b"si1", [0], [(9, len(data) - 9)]), self.assertThat(read(b"si1", [0], [(9, len(data) - 9)]),
Equals({0: [data[9:]]})) Equals({0: [data[9:]]}))
d.addCallback(_then_again) d.addCallback(_then_again)
@ -3335,10 +3334,10 @@ class MDMFProxies(SyncTestCase, ShouldFailMixin):
class Stats(SyncTestCase): class Stats(SyncTestCase):
def setUp(self): def setUp(self):
super(Stats, self).setUp()
self.sparent = LoggingServiceParent() self.sparent = LoggingServiceParent()
self._lease_secret = itertools.count() self._lease_secret = itertools.count()
def tearDown(self): self.addCleanup(self.sparent.stopService())
return self.sparent.stopService()
def workdir(self, name): def workdir(self, name):
basedir = os.path.join("storage", "Server", name) basedir = os.path.join("storage", "Server", name)
@ -3418,7 +3417,7 @@ class Stats(SyncTestCase):
immutable_schemas = strategies.sampled_from(list(ALL_IMMUTABLE_SCHEMAS)) immutable_schemas = strategies.sampled_from(list(ALL_IMMUTABLE_SCHEMAS))
class ShareFileTests(unittest.TestCase): class ShareFileTests(SyncTestCase):
"""Tests for allmydata.storage.immutable.ShareFile.""" """Tests for allmydata.storage.immutable.ShareFile."""
def get_sharefile(self, **kwargs): def get_sharefile(self, **kwargs):