Merge samuelmz/buildbot:fixes#2754 (PR #1134)

buildbot · Apr 16, 2014 · c34a301 · c34a301
2 parents cf4c10c + 5dcce78
commit c34a301
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/master/buildbot/test/unit/test_master.py b/master/buildbot/test/unit/test_master.py
@@ -277,7 +277,7 @@ def test_startup_bad_config(self):
 
         @d.addCallback
         def check(_):
-            reactor.stop.assert_called()
+            reactor.stop.assert_called_with()
             self.assertLogged("oh noes")
         return d
 
@@ -293,7 +293,7 @@ def db_setup():
 
         @d.addCallback
         def check(_):
-            reactor.stop.assert_called()
+            reactor.stop.assert_called_with()
             self.assertLogged("GOT HERE")
         return d
 
@@ -309,7 +309,7 @@ def db_setup():
 
         @d.addCallback
         def check(_):
-            reactor.stop.assert_called()
+            reactor.stop.assert_called_with()
             self.assertEqual(len(self.flushLoggedErrors(RuntimeError)), 1)
         return d
 
@@ -336,7 +336,7 @@ def test_reconfig(self):
 
         @d.addCallback
         def check(_):
-            self.master.reconfigService.assert_called()
+            self.master.reconfigService.assert_called_with(mock.ANY)
         return d
 
     @defer.inlineCallbacks
@@ -398,7 +398,7 @@ def test_reconfigService_stop_polling(self):
         new.db['db_poll_interval'] = None
         yield self.master.reconfigService(new)
 
-        db_loop.stop.assert_called()
+        db_loop.stop.assert_called_with()
         self.assertEqual(self.master.db_loop, None)
 
 

diff --git a/master/buildbot/test/unit/test_scripts_create_master.py b/master/buildbot/test/unit/test_scripts_create_master.py
@@ -244,5 +244,5 @@ def test_createDB(self):
             mkconfig(basedir='test', quiet=True),
             _noMonkey=True)
         setup.asset_called_with(check_version=False, verbose=False)
-        upgrade.assert_called()
+        upgrade.assert_called_with()
         self.assertWasQuiet()
diff --git a/master/buildbot/test/unit/test_scripts_upgrade_master.py b/master/buildbot/test/unit/test_scripts_upgrade_master.py
@@ -265,5 +265,5 @@ def test_upgradeDatabase(self):
             mkconfig(basedir='test', quiet=True),
             config_module.MasterConfig())
         setup.asset_called_with(check_version=False, verbose=False)
-        upgrade.assert_called()
+        upgrade.assert_called_with()
         self.assertWasQuiet()