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

All of test_storage passes on Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring
2020-08-31 13:17:52 -04:00
parent 2b37da9ca0
commit 1cfe58a52d
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
from future.utils import native_str, PY3
from future.utils import native_str, PY3, bytes_to_native_str
import time
import os.path
@ -731,7 +731,7 @@ class Server(unittest.TestCase):
si0_s = base32.b2a(b"si0")
ss.remote_advise_corrupt_share(b"immutable", b"si0", 0,
"This share smells funny.\n")
b"This share smells funny.\n")
reportdir = os.path.join(workdir, "corruption-advisories")
reports = os.listdir(reportdir)
self.failUnlessEqual(len(reports), 1)
@ -755,11 +755,11 @@ class Server(unittest.TestCase):
b = ss.remote_get_buckets(b"si1")
self.failUnlessEqual(set(b.keys()), set([1]))
b[1].remote_advise_corrupt_share("This share tastes like dust.\n")
b[1].remote_advise_corrupt_share(b"This share tastes like dust.\n")
reports = os.listdir(reportdir)
self.failUnlessEqual(len(reports), 2)
report_si1 = [r for r in reports if si1_s in r][0]
report_si1 = [r for r in reports if bytes_to_native_str(si1_s) in r][0]
f = open(os.path.join(reportdir, report_si1), "rb")
report = f.read()
f.close()