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

[Bogdana Vereha]

Update monitor.tests.test_usermonitor to use mock instead of mocker

Update monitor.tests.test_usermonitor to use mock instead of mocker

Testing instructions:
Unit tests

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Free Ekanayaka (free.ekanayaka)]

+1

review: Approve

[Chad Smith (chad.smith)]

Thanks for this approach, I changed my branch as well to avoid hacking side_effect as it felt a more cryptic approach. +1

review: Approve

=== modified file 'landscape/monitor/tests/test_usermonitor.py'
--- landscape/monitor/tests/test_usermonitor.py	2016-02-08 14:18:31 +0000
+++ landscape/monitor/tests/test_usermonitor.py	2016-06-15 20:35:14 +0000
@@ -1,6 +1,7 @@
 import os
 import tempfile
 
+from mock import Mock, ANY
 from twisted.internet.defer import fail
 
 from landscape.amp import ComponentPublisher
@@ -9,7 +10,6 @@
 from landscape.manager.usermanager import UserManager
 from landscape.user.tests.helpers import FakeUserProvider
 from landscape.tests.helpers import LandscapeTest, MonitorHelper
-from landscape.tests.mocker import ANY
 import landscape.monitor.usermonitor
 
 
@@ -245,14 +245,14 @@
         super class, which sets up a looping call to run the plugin
         every L{UserMonitor.run_interval} seconds.
         """
-        self.plugin.run = self.mocker.mock()
-        self.expect(self.plugin.run()).count(5)
-        self.mocker.replay()
+        self.plugin.run = Mock()
+
         self.monitor.add(self.plugin)
-
         self.broker_service.message_store.set_accepted_types(["users"])
         self.reactor.advance(self.plugin.run_interval * 5)
 
+        self.assertEqual(self.plugin.run.call_count, 5)
+
     def test_run_with_operation_id(self):
         """
         The L{UserMonitor} should have message run which should enqueue a
@@ -463,10 +463,9 @@
             self.assertFalse(persist.get("groups"))
 
         self.broker_service.message_store.set_accepted_types(["users"])
-        self.monitor.broker.send_message = self.mocker.mock()
-        self.monitor.broker.send_message(ANY, ANY, urgent=True)
-        self.mocker.result(fail(RuntimeError()))
-        self.mocker.replay()
+
+        self.monitor.broker.send_message = Mock(return_value=fail(
+            RuntimeError()))
 
         self.provider.users = [("jdoe", "x", 1000, 1000, "JD,,,,",
                                 "/home/jdoe", "/bin/sh")]
@@ -477,4 +476,5 @@
         result.addCallback(lambda remote: remote.detect_changes(1001))
         result.addCallback(got_result)
         result.addCallback(lambda x: connector.disconnect())
-        return result
+        self.monitor.broker.send_message.assert_called_once_with(
+            ANY, ANY, urgent=True)