Merge lp:~chad.smith/landscape-client/mocker-to-mock-activeprocess into lp:~landscape/landscape-client/trunk

[Chad Smith]

Mocker to mock activeprocess unit tests.

Mocker to mock activeprocess unit tests.

[Simon Poirier (simpoir)]

+1 with an inline suggestion.

review: Approve

[Adam Collard (adam-collard)]

+1 assuming the revert of the changes to the test_processorinfo

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make check
Result: Success
Revno: 861
Branch: lp:~chad.smith/landscape-client/mocker-to-mock-activeprocess
Jenkins: https://ci.lscape.net/job/latch-test/5059/

review: Approve (test results)

[lp:~chad.smith/landscape-client/mocker-to-mock-activeprocess]

862. By Chad Smith on 2016-06-15

use return_value in Mock init as side_effect hacking is unnecessary for a single call

863. By Chad Smith on 2016-06-15

lint fix

=== modified file 'landscape/monitor/tests/test_activeprocessinfo.py'
--- landscape/monitor/tests/test_activeprocessinfo.py	2014-09-01 13:16:02 +0000
+++ landscape/monitor/tests/test_activeprocessinfo.py	2016-06-15 21:11:06 +0000
@@ -9,7 +9,7 @@
 from landscape.monitor.activeprocessinfo import ActiveProcessInfo
 from landscape.tests.helpers import (LandscapeTest, MonitorHelper,
                                      ProcessDataBuilder)
-from landscape.tests.mocker import ANY
+from mock import ANY, Mock
 
 
 class ActiveProcessInfoTest(LandscapeTest):
@@ -533,10 +533,8 @@
         plugin = ActiveProcessInfo(proc_dir=self.sample_dir, uptime=10)
         self.monitor.add(plugin)
 
-        broker_mock = self.mocker.replace(self.monitor.broker)
-        broker_mock.send_message(ANY, ANY, urgent=ANY)
-        self.mocker.result(fail(MyException()))
-        self.mocker.replay()
+        self.monitor.broker.send_message = Mock(
+            return_value=fail(MyException()))
 
         message = plugin.get_message()
 
@@ -545,6 +543,8 @@
 
         result = plugin.exchange()
         result.addCallback(assert_message)
+        self.monitor.broker.send_message.assert_called_once_with(
+            ANY, ANY, urgent=ANY)
         return result
 
     def test_process_updates(self):