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

whitespace on long lines

Browse Source
This commit is contained in:
meejah 2018-05-29 15:52:09 -06:00
parent 8e0e96da01
commit 4aec12a92f
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/allmydata/test/test_client.py
View File

@ -71,7 +71,13 @@ class Basic(testutil.ReallyEqualMixin, testutil.NonASCIIPathMixin, unittest.Test
old_mode = os.stat(fn).st_mode old_mode = os.stat(fn).st_mode
os.chmod(fn, 0) os.chmod(fn, 0)
try: try:
e = self.assertRaises(EnvironmentError, read_config, basedir, "client.port", _valid_config_sections=client._valid_config_sections) e = self.assertRaises(
EnvironmentError,
read_config,
basedir,
"client.port",
_valid_config_sections=client._valid_config_sections,
)
self.assertIn("Permission denied", str(e)) self.assertIn("Permission denied", str(e))
finally: finally:
# don't leave undeleteable junk lying around # don't leave undeleteable junk lying around
@ -93,7 +99,13 @@ class Basic(testutil.ReallyEqualMixin, testutil.NonASCIIPathMixin, unittest.Test
logged_messages = [] logged_messages = []
self.patch(twisted.python.log, 'msg', logged_messages.append) self.patch(twisted.python.log, 'msg', logged_messages.append)
e = self.failUnlessRaises(OldConfigError, read_config, basedir, "client.port", _valid_config_sections=client._valid_config_sections) e = self.failUnlessRaises(
OldConfigError,
read_config,
basedir,
"client.port",
_valid_config_sections=client._valid_config_sections,
)
abs_basedir = fileutil.abspath_expanduser_unicode(unicode(basedir)).encode(sys.getfilesystemencoding()) abs_basedir = fileutil.abspath_expanduser_unicode(unicode(basedir)).encode(sys.getfilesystemencoding())
self.failUnlessIn(os.path.join(abs_basedir, "introducer.furl"), e.args[0]) self.failUnlessIn(os.path.join(abs_basedir, "introducer.furl"), e.args[0])
self.failUnlessIn(os.path.join(abs_basedir, "no_storage"), e.args[0]) self.failUnlessIn(os.path.join(abs_basedir, "no_storage"), e.args[0])

24
src/allmydata/test/test_node.py
View File

@ -30,7 +30,11 @@ class TestNode(Node):
CERTFILE='DEFAULT_CERTFILE_BLANK' CERTFILE='DEFAULT_CERTFILE_BLANK'
def __init__(self, basedir): def __init__(self, basedir):
config = read_config(basedir, 'DEFAULT_PORTNUMFILE_BLANK', _valid_config_sections=_valid_config_sections) config = read_config(
basedir,
'DEFAULT_PORTNUMFILE_BLANK',
_valid_config_sections=_valid_config_sections,
)
Node.__init__(self, config, basedir) Node.__init__(self, config, basedir)
@ -262,7 +266,11 @@ class PortLocation(unittest.TestCase):
n = EmptyNode() n = EmptyNode()
basedir = os.path.join("test_node/portlocation/%s/%s" % (tp, tl)) basedir = os.path.join("test_node/portlocation/%s/%s" % (tp, tl))
fileutil.make_dirs(basedir) fileutil.make_dirs(basedir)
config = n.config = read_config(basedir, "node.port", _valid_config_sections=_valid_config_sections) config = n.config = read_config(
basedir,
"node.port",
_valid_config_sections=_valid_config_sections,
)
n._reveal_ip = True n._reveal_ip = True
if exp in ("ERR1", "ERR2", "ERR3", "ERR4"): if exp in ("ERR1", "ERR2", "ERR3", "ERR4"):
@ -377,7 +385,11 @@ class Listeners(unittest.TestCase):
f.write("tub.location = %s\n" % location) f.write("tub.location = %s\n" % location)
# we're doing a lot of calling-into-setup-methods here, it might be # we're doing a lot of calling-into-setup-methods here, it might be
# better to just create a real Node instance, I'm not sure. # better to just create a real Node instance, I'm not sure.
n.config = read_config(n.basedir, "client.port", _valid_config_sections=_valid_config_sections) n.config = read_config(
n.basedir,
"client.port",
_valid_config_sections=_valid_config_sections,
)
n.check_privacy() n.check_privacy()
n.services = [] n.services = []
n.create_i2p_provider() n.create_i2p_provider()
@ -403,7 +415,11 @@ class Listeners(unittest.TestCase):
f.write("tub.location = tcp:example.org:1234\n") f.write("tub.location = tcp:example.org:1234\n")
# we're doing a lot of calling-into-setup-methods here, it might be # we're doing a lot of calling-into-setup-methods here, it might be
# better to just create a real Node instance, I'm not sure. # better to just create a real Node instance, I'm not sure.
n.config = read_config(n.basedir, "client.port", _valid_config_sections=_valid_config_sections) n.config = read_config(
n.basedir,
"client.port",
_valid_config_sections=_valid_config_sections,
)
n.check_privacy() n.check_privacy()
n.services = [] n.services = []
i2p_ep = object() i2p_ep = object()