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

fix tests by overriding/patching reactor.stop in tests

Browse Source
This commit is contained in:
meejah 2018-06-27 03:04:58 -06:00
parent 423208f391
commit 0607b7331f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/test/cli/test_daemonize.py
View File

@ -37,6 +37,7 @@ class Util(unittest.TestCase):
with patch('twisted.internet.reactor') as r: with patch('twisted.internet.reactor') as r:
def call(fn, *args, **kw): def call(fn, *args, **kw):
fn() fn()
r.stop = lambda: None
r.callWhenRunning = call r.callWhenRunning = call
service = plug.makeService(None) service = plug.makeService(None)
service.parent = Mock() service.parent = Mock()
@ -52,6 +53,7 @@ class Util(unittest.TestCase):
def call(fn, *args, **kw): def call(fn, *args, **kw):
fn() fn()
r.callWhenRunning = call r.callWhenRunning = call
r.stop = lambda: None
service = plug.makeService(None) service = plug.makeService(None)
service.parent = Mock() service.parent = Mock()
with self.assertRaises(ValueError) as ctx: with self.assertRaises(ValueError) as ctx:
@ -68,6 +70,7 @@ class Util(unittest.TestCase):
with patch('twisted.internet.reactor') as r: with patch('twisted.internet.reactor') as r:
def call(fn, *args, **kw): def call(fn, *args, **kw):
fn() fn()
r.stop = lambda: None
r.callWhenRunning = call r.callWhenRunning = call
service = plug.makeService(None) service = plug.makeService(None)
service.parent = Mock() service.parent = Mock()
@ -97,6 +100,7 @@ class RunDaemonizeTests(unittest.TestCase):
self._working = os.path.abspath('.') self._working = os.path.abspath('.')
d = super(RunDaemonizeTests, self).setUp() d = super(RunDaemonizeTests, self).setUp()
self._reactor = patch('twisted.internet.reactor') self._reactor = patch('twisted.internet.reactor')
self._reactor.stop = lambda: None
self._twistd = patch('allmydata.scripts.tahoe_daemonize.twistd') self._twistd = patch('allmydata.scripts.tahoe_daemonize.twistd')
self.node_dir = self.mktemp() self.node_dir = self.mktemp()
os.mkdir(self.node_dir) os.mkdir(self.node_dir)

6
src/allmydata/test/cli/test_start.py
View File

@ -218,7 +218,11 @@ class RunTests(unittest.TestCase):
os.mkdir(self.node_dir) os.mkdir(self.node_dir)
return d return d
def test_run_invalid_config(self): @patch('twisted.internet.reactor')
def test_run_invalid_config(self, reactor):
def cwr(fn, *args, **kw):
fn()
reactor.callWhenRunning = cwr
with open(os.path.join(self.node_dir, "client.tac"), "w") as f: with open(os.path.join(self.node_dir, "client.tac"), "w") as f:
f.write('test') f.write('test')