Merge lp:~bogdana/landscape-client/mocker-monitor-test-plugin into lp:~landscape/landscape-client/trunk

[Bogdana Vereha]

Update monitor.test_plugin to use mock instead of mocker

Update monitor.test_plugin to use mock instead of mocker

Testing instructions:
unittests

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[Chris Glass (tribaal)]

Yep yep! +1

review: Approve

[🤖 Landscape Builder (landscape-builder)]

Command: make check
Result: Success
Revno: 864
Branch: lp:~bogdana/landscape-client/mocker-monitor-test-plugin
Jenkins: https://ci.lscape.net/job/latch-test/5064/

review: Approve (test results)

[Benji York (benji)]

This looks good.

review: Approve

=== modified file 'landscape/monitor/tests/test_plugin.py'
--- landscape/monitor/tests/test_plugin.py	2013-08-22 14:08:19 +0000
+++ landscape/monitor/tests/test_plugin.py	2016-06-15 21:42:02 +0000
@@ -1,8 +1,7 @@
-from twisted.internet.defer import succeed
+from mock import ANY, Mock, patch
 
 from landscape.monitor.plugin import MonitorPlugin, DataWatcher
 from landscape.schema import Message, Int
-from landscape.tests.mocker import ANY
 from landscape.tests.helpers import (
     LandscapeTest, MonitorHelper, LogKeeperHelper)
 
@@ -48,11 +47,10 @@
         """
         plugin = MonitorPlugin()
         plugin.register(self.monitor)
-        callback = self.mocker.mock()
-        callback("foo", kwarg="bar")
-        self.mocker.replay()
+        callback = Mock()
         plugin.call_on_accepted("type", callback, "foo", kwarg="bar")
         self.reactor.fire(("message-type-acceptance-changed", "type"), True)
+        callback.assert_called_once_with("foo", kwarg="bar")
 
     def test_call_on_accepted_when_unaccepted(self):
         """
@@ -163,13 +161,11 @@
         When exchange is called with an urgent argument set to True
         make sure it sends the message urgently.
         """
-        remote_broker_mock = self.mocker.replace(self.remote)
-        remote_broker_mock.send_message(ANY, ANY, urgent=True)
-        self.mocker.result(succeed(None))
-        self.mocker.replay()
-
-        self.mstore.set_accepted_types(["wubble"])
-        self.plugin.exchange(True)
+        with patch.object(self.remote, "send_message"):
+            self.mstore.set_accepted_types(["wubble"])
+            self.plugin.exchange(True)
+            self.remote.send_message.assert_called_once_with(
+                ANY, ANY, urgent=True)
 
     def test_no_message_if_not_accepted(self):
         """