Merge lp:~tribaal/landscape-client/remove-mocker-test-updatemanager into lp:~landscape/landscape-client/trunk

[Chris Glass]

s/mocker/mock/

s/mocker/mock/

Testing instructions:

[Chad Smith (chad.smith)]

+1. Keep that train going. Chugga Chugga choo-choo.

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make check
Result: Success
Revno: 843
Branch: lp:~tribaal/landscape-client/remove-mocker-test-updatemanager
Jenkins: https://ci.lscape.net/job/latch-test/5049/

review: Approve (test results)

[Bogdana Vereha (bogdana)]

+1

review: Approve

=== modified file 'landscape/monitor/tests/test_updatemanager.py'
--- landscape/monitor/tests/test_updatemanager.py	2013-07-12 13:41:07 +0000
+++ landscape/monitor/tests/test_updatemanager.py	2016-06-15 18:27:57 +0000
@@ -1,7 +1,8 @@
+import mock
+
 from landscape.monitor.updatemanager import UpdateManager
 from landscape.tests.helpers import (
     LandscapeTest, MonitorHelper, LogKeeperHelper)
-from landscape.tests.mocker import ANY
 
 
 class UpdateManagerTest(LandscapeTest):
@@ -90,10 +91,10 @@
         If the server can accept them, the plugin should send
         C{update-manager} messages.
         """
-        broker_mock = self.mocker.replace(self.remote)
-        broker_mock.send_message(ANY, ANY)
-        self.mocker.replay()
-        self.plugin.run()
+        with mock.patch.object(self.remote, "send_message"):
+            self.plugin.run()
+            self.remote.send_message.assert_called_once_with(
+                mock.ANY, mock.ANY)
         self.mstore.set_accepted_types([])
         self.plugin.run()