Move ShouldFailMixin back to common_util

There were originally two versions of this, one in common and another in
common_util. We moved both into common_py3 but then removed the one from
common, so here we move back to common_util, while allowing imports from
common to avoid a noisy changeset.
This commit is contained in:
Chad Whitacre
2020-09-30 22:55:33 -04:00
parent 2c2b61676c
commit 23140b8b1c
6 changed files with 54 additions and 54 deletions

View File

@ -51,8 +51,8 @@ from allmydata.test.no_network import NoNetworkServer
from allmydata.storage_client import (
_StorageServer,
)
from .common import LoggingServiceParent
from .common_py3 import FakeCanary, ShouldFailMixin
from .common import LoggingServiceParent, ShouldFailMixin
from .common_py3 import FakeCanary
class UtilTests(unittest.TestCase):