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

fix line separator

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-05-03 12:09:03 -04:00
parent 97e8ba8301
commit aac36fb30a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/allmydata/test/test_runner.py
View File

@ -10,6 +10,7 @@ from unittest import (
) )
import attr import attr
from os import linesep
from twisted.trial import unittest from twisted.trial import unittest
@ -429,10 +430,13 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
# This makes sure that node.url is written, which allows us to # This makes sure that node.url is written, which allows us to
# detect when the introducer restarts in _node_has_restarted below. # detect when the introducer restarts in _node_has_restarted below.
config = fileutil.read(tahoe.config_file.path) config = fileutil.read(tahoe.config_file.path)
self.assertIn('\nweb.port = \n', config) self.assertIn('{}web.port = {}'.format(linesep, linesep), config)
fileutil.write( fileutil.write(
tahoe.config_file.path, tahoe.config_file.path,
config.replace('\nweb.port = \n', '\nweb.port = 0\n'), config.replace(
'{}web.port = {}'.format(linesep, linesep),
'{}web.port = 0{}'.format(linesep, linesep),
)
) )
p = Expect() p = Expect()
@ -502,7 +506,10 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
# Check that the --webport option worked. # Check that the --webport option worked.
config = fileutil.read(tahoe.config_file.path) config = fileutil.read(tahoe.config_file.path)
self.assertIn('\nweb.port = 0\n', config) self.assertIn(
'{}web.port = 0{}'.format(linesep, linesep),
config,
)
# After this it's safe to start the node # After this it's safe to start the node
tahoe.active() tahoe.active()