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

[Chris Glass]

s/mocker/mock/

s/mocker/mock/

Testing instructions:

[🤖 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-computerinfo
Jenkins: https://ci.lscape.net/job/latch-test/5053/

review: Approve (test results)

[Bogdana Vereha (bogdana)]

+1

review: Approve

[Данило Шеган (danilo)]

review: Approve

=== modified file 'landscape/monitor/tests/test_computerinfo.py'
--- landscape/monitor/tests/test_computerinfo.py	2013-11-22 20:33:19 +0000
+++ landscape/monitor/tests/test_computerinfo.py	2016-06-15 20:17:08 +0000
@@ -1,3 +1,4 @@
+import mock
 import os
 import re
 
@@ -7,7 +8,6 @@
 from landscape.lib.fs import create_file
 from landscape.monitor.computerinfo import ComputerInfo, METADATA_RETRY_MAX
 from landscape.tests.helpers import LandscapeTest, MonitorHelper
-from landscape.tests.mocker import ANY
 
 SAMPLE_LSB_RELEASE = "DISTRIB_ID=Ubuntu\n"                         \
                      "DISTRIB_RELEASE=6.06\n"                      \
@@ -321,27 +321,25 @@
     def test_computer_info_call_on_accepted(self):
         plugin = ComputerInfo(fetch_async=self.fetch_func)
         self.monitor.add(plugin)
-
-        remote_broker_mock = self.mocker.replace(self.remote)
-        remote_broker_mock.send_message(ANY, ANY, urgent=True)
-        self.mocker.replay()
-
         self.mstore.set_accepted_types(["computer-info"])
-        self.reactor.fire(("message-type-acceptance-changed", "computer-info"),
-                          True)
+
+        with mock.patch.object(self.remote, "send_message"):
+            self.reactor.fire(("message-type-acceptance-changed",
+                               "computer-info"), True)
+            self.remote.send_message.assert_called_once_with(
+                mock.ANY, mock.ANY, urgent=True)
 
     def test_distribution_info_call_on_accepted(self):
         plugin = ComputerInfo()
         self.monitor.add(plugin)
 
-        remote_broker_mock = self.mocker.replace(self.remote)
-        remote_broker_mock.send_message(ANY, ANY, urgent=True)
-        self.mocker.replay()
-
         self.mstore.set_accepted_types(["distribution-info"])
-        self.reactor.fire(("message-type-acceptance-changed",
-                           "distribution-info"),
-                          True)
+
+        with mock.patch.object(self.remote, "send_message"):
+            self.reactor.fire(("message-type-acceptance-changed",
+                               "distribution-info"), True)
+            self.remote.send_message.assert_called_once_with(
+                mock.ANY, mock.ANY, urgent=True)
 
     def test_message_if_not_accepted(self):
         """