summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestServer/TestPlugin.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-16 15:57:51 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-16 15:57:51 -0400
commitfc29986ddf780202651053aeafa308653f05d2dd (patch)
tree82e44af496d20506ead215f25b2fb5a0cc82a359 /testsuite/Testlib/TestServer/TestPlugin.py
parentb2d11440759e79d8485a22ba71933b691ff749a4 (diff)
downloadbcfg2-fc29986ddf780202651053aeafa308653f05d2dd.tar.gz
bcfg2-fc29986ddf780202651053aeafa308653f05d2dd.tar.bz2
bcfg2-fc29986ddf780202651053aeafa308653f05d2dd.zip
minor test fixes
Diffstat (limited to 'testsuite/Testlib/TestServer/TestPlugin.py')
-rw-r--r--testsuite/Testlib/TestServer/TestPlugin.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py
index ab9754e00..678c65264 100644
--- a/testsuite/Testlib/TestServer/TestPlugin.py
+++ b/testsuite/Testlib/TestServer/TestPlugin.py
@@ -362,6 +362,7 @@ class TestThreadedStatistics(TestStatistics):
return ts.work_queue.get_calls > 3
core.terminate.isSet.side_effect = terminate_isset
+ ts.work_queue.empty.return_value = False
ts.run()
mock_load.assert_any_call()
self.assertGreaterEqual(ts.work_queue.get.call_count, len(self.data))
@@ -1720,7 +1721,7 @@ class TestEntrySet(TestDebuggable):
spec.prio = prio
spec.host = host
if prio:
- spec.__cmp__ = lambda o: cmp(spec.prio, o.prio)
+ spec.__cmp__ = lambda s, o: cmp(s.prio, o.prio)
return spec
self.assertRaises(PluginExecutionError,