ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-12 13:18:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests pass on Python 3.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-04-07 09:26:28 -04:00
parent 47c8ce3590
commit 803e00f6b1
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/allmydata/test/test_multi_introducers.py
View File

@ -1,6 +1,9 @@
#!/usr/bin/python
from past.builtins import unicode
import os
from six import ensure_binary
from twisted.python.filepath import FilePath
from twisted.trial import unittest
from twisted.internet import defer
@ -43,7 +46,7 @@ class MultiIntroTests(unittest.TestCase):
u'intro2':{ 'furl': 'furl4' },
},
}
self.yaml_path.setContent(yamlutil.safe_dump(connections))
self.yaml_path.setContent(ensure_binary(yamlutil.safe_dump(connections)))
# get a client and count of introducer_clients
myclient = yield create_client(self.basedir)
ic_count = len(myclient.introducer_clients)
@ -73,7 +76,7 @@ class MultiIntroTests(unittest.TestCase):
tahoe_cfg_furl = myclient.introducer_clients[0].introducer_furl
# assertions
self.failUnlessEqual(fake_furl, tahoe_cfg_furl)
self.failUnlessEqual(fake_furl, unicode(tahoe_cfg_furl, "utf-8"))
self.assertEqual(
list(
warning["message"]
@ -97,10 +100,10 @@ class MultiIntroTests(unittest.TestCase):
u'default': { 'furl': 'furl1' },
},
}
self.yaml_path.setContent(yamlutil.safe_dump(connections))
self.yaml_path.setContent(ensure_binary(yamlutil.safe_dump(connections)))
FilePath(self.basedir).child("tahoe.cfg").setContent(
"[client]\n"
"introducer.furl = furl1\n"
b"[client]\n"
b"introducer.furl = furl1\n"
)
with self.assertRaises(ValueError) as ctx:
@ -112,7 +115,7 @@ class MultiIntroTests(unittest.TestCase):
"please fix impossible configuration.",
)
SIMPLE_YAML = """
SIMPLE_YAML = b"""
introducers:
one:
furl: furl1
@ -121,7 +124,7 @@ introducers:
# this format was recommended in docs/configuration.rst in 1.12.0, but it
# isn't correct (the "furl = furl1" line is recorded as the string value of
# the ["one"] key, instead of being parsed as a single-key dictionary).
EQUALS_YAML = """
EQUALS_YAML = b"""
introducers:
one: furl = furl1
"""
@ -147,17 +150,17 @@ class NoDefault(unittest.TestCase):
connections = {'introducers': {
u'one': { 'furl': 'furl1' },
}}
self.yaml_path.setContent(yamlutil.safe_dump(connections))
self.yaml_path.setContent(ensure_binary(yamlutil.safe_dump(connections)))
myclient = yield create_client(self.basedir)
tahoe_cfg_furl = myclient.introducer_clients[0].introducer_furl
self.assertEquals(tahoe_cfg_furl, 'furl1')
self.assertEquals(tahoe_cfg_furl, b'furl1')
@defer.inlineCallbacks
def test_real_yaml(self):
self.yaml_path.setContent(SIMPLE_YAML)
myclient = yield create_client(self.basedir)
tahoe_cfg_furl = myclient.introducer_clients[0].introducer_furl
self.assertEquals(tahoe_cfg_furl, 'furl1')
self.assertEquals(tahoe_cfg_furl, b'furl1')
@defer.inlineCallbacks
def test_invalid_equals_yaml(self):
@ -172,6 +175,6 @@ class NoDefault(unittest.TestCase):
@defer.inlineCallbacks
def test_introducerless(self):
connections = {'introducers': {} }
self.yaml_path.setContent(yamlutil.safe_dump(connections))
self.yaml_path.setContent(ensure_binary(yamlutil.safe_dump(connections)))
myclient = yield create_client(self.basedir)
self.assertEquals(len(myclient.introducer_clients), 0)