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

Use AsyncTestCase.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-09-13 09:28:03 -04:00
parent b0d635c9c9
commit 1fa0f72c8e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/allmydata/test/test_istorageserver.py
View File

@ -19,15 +19,16 @@ if PY2:
# fmt: on # fmt: on
from random import randrange from random import randrange
from unittest import skipIf
from testtools import skipIf
from twisted.internet.defer import inlineCallbacks from twisted.internet.defer import inlineCallbacks
from twisted.trial.unittest import TestCase
from foolscap.api import Referenceable from foolscap.api import Referenceable
from allmydata.interfaces import IStorageServer from allmydata.interfaces import IStorageServer
from .test_system import SystemTestMixin from .test_system import SystemTestMixin
from .common import AsyncTestCase
def _randbytes(length): def _randbytes(length):
@ -87,8 +88,8 @@ class IStorageServerImmutableAPIsTestsMixin(object):
self.assertEqual(set(allocated.keys()), set(range(5))) self.assertEqual(set(allocated.keys()), set(range(5)))
# We validate the bucket objects' interface in a later test. # We validate the bucket objects' interface in a later test.
@skipIf(True, "https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3793")
@inlineCallbacks @inlineCallbacks
@skipIf(True, "https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3793")
def test_allocate_buckets_repeat(self): def test_allocate_buckets_repeat(self):
""" """
allocate_buckets() with the same storage index returns the same result, allocate_buckets() with the same storage index returns the same result,
@ -256,6 +257,7 @@ class _FoolscapMixin(SystemTestMixin):
@inlineCallbacks @inlineCallbacks
def setUp(self): def setUp(self):
AsyncTestCase.setUp(self)
self.basedir = "test_istorageserver/" + self.id() self.basedir = "test_istorageserver/" + self.id()
yield SystemTestMixin.setUp(self) yield SystemTestMixin.setUp(self)
yield self.set_up_nodes(1) yield self.set_up_nodes(1)
@ -264,14 +266,19 @@ class _FoolscapMixin(SystemTestMixin):
).get_storage_server() ).get_storage_server()
self.assertTrue(IStorageServer.providedBy(self.storage_server)) self.assertTrue(IStorageServer.providedBy(self.storage_server))
@inlineCallbacks
def tearDown(self):
AsyncTestCase.tearDown(self)
yield SystemTestMixin.tearDown(self)
class FoolscapSharedAPIsTests( class FoolscapSharedAPIsTests(
_FoolscapMixin, IStorageServerSharedAPIsTestsMixin, TestCase _FoolscapMixin, IStorageServerSharedAPIsTestsMixin, AsyncTestCase
): ):
"""Foolscap-specific tests for shared ``IStorageServer`` APIs.""" """Foolscap-specific tests for shared ``IStorageServer`` APIs."""
class FoolscapImmutableAPIsTests( class FoolscapImmutableAPIsTests(
_FoolscapMixin, IStorageServerImmutableAPIsTestsMixin, TestCase _FoolscapMixin, IStorageServerImmutableAPIsTestsMixin, AsyncTestCase
): ):
"""Foolscap-specific tests for immutable ``IStorageServer`` APIs.""" """Foolscap-specific tests for immutable ``IStorageServer`` APIs."""