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

Fix test failures.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2020-08-11 16:50:42 -04:00
parent 80c7739096
commit 9ad5602477
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/test/common_py3.py
View File

@ -9,7 +9,7 @@ from __future__ import absolute_import
from __future__ import division from __future__ import division
from __future__ import print_function from __future__ import print_function
from future.utils import PY2 from future.utils import PY2, native_str, native_bytes
if PY2: if PY2:
from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401 from builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401
@ -72,7 +72,7 @@ class ShouldFailMixin(object):
def shouldFail(self, expected_failure, which, substring, def shouldFail(self, expected_failure, which, substring,
callable, *args, **kwargs): callable, *args, **kwargs):
assert substring is None or isinstance(substring, str) assert substring is None or isinstance(substring, (native_str, native_bytes))
d = defer.maybeDeferred(callable, *args, **kwargs) d = defer.maybeDeferred(callable, *args, **kwargs)
def done(res): def done(res):
if isinstance(res, failure.Failure): if isinstance(res, failure.Failure):