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

[Chris Glass]

s/mocker/mock/

Replaced some mocking, etc.

Testing instructions:

[Benji York (benji)]

This branch looks good with one small comment inline.

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-process
Jenkins: https://ci.lscape.net/job/latch-test/5030/

review: Approve (test results)

[Free Ekanayaka (free.ekanayaka)]

+1

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[🤖 Landscape Builder (landscape-builder)]

The attempt to merge lp:~tribaal/landscape-client/remove-mocker-process into lp:landscape-client failed. Below is the output from the failed tests.

python setup.py build_ext -i
running build_ext
landscape.broker.tests.test_amp
  RemoteBrokerTest
    test_call_if_accepted ... [OK]
    test_call_if_accepted_with_not_accepted ... [OK]
    test_call_on_events ... [OK]
    test_exit ... [OK]
    test_fire_event ... [OK]
    test_get_accepted_message_types ... [OK]
    test_get_server_uuid ... [OK]
    test_is_message_pending ... [OK]
    test_listen_events ... [OK]
    test_method_call_error ... [OK]
    test_ping ... [OK]
    test_register ... [OK]
    test_register_client ... [OK]
    test_register_client_accepted_message_type ... [OK]
    test_reload_configuration ... [OK]
    test_send_message ... [OK]
    test_send_message_with_urgent ... [OK]
    test_stop_clients ... [OK]
  RemoteClientTest
    test_exit ... [OK]
    test_fire_event ... [OK]
    test_message ... [OK]
    test_method_call_error ... [OK]
    test_ping ... [OK]
landscape.broker.tests.test_client
  BrokerClientTest
    test_add ... [OK]
    test_dispatch_message ... [OK]
    test_dispatch_message_with_exception ... [OK]
    test_dispatch_message_with_no_handler ... [OK]
    test_exchange ... [OK]
    test_exchange_logs_errors_and_continues ... [OK]
    test_exchange_on_plugin_without_exchange_method ... [OK]
    test_exit ... [OK]
    test_fire_event ... [OK]
    test_fire_event_with_acceptance_changed ... [OK]
    test_fire_event_with_arguments ... [OK]
    test_fire_event_with_mixed_results ... [OK]
    test_get_named_plugin ... [OK]
...

=== modified file 'landscape/lib/tests/test_process.py'
--- landscape/lib/tests/test_process.py	2012-10-10 13:32:10 +0000
+++ landscape/lib/tests/test_process.py	2016-06-15 17:28:32 +0000
@@ -1,4 +1,5 @@
 import unittest
+import mock
 import os
 
 from landscape.tests.helpers import LandscapeTest
@@ -39,15 +40,14 @@
         stat = " ".join(stat_array)
         create_file(os.path.join(process_dir, "stat"), stat)
 
-    def test_missing_process_race(self):
+    @mock.patch("landscape.lib.process.detect_jiffies", return_value=1)
+    @mock.patch("os.listdir")
+    def test_missing_process_race(self, list_dir_mock, jiffies_mock):
         """
         We use os.listdir("/proc") to get the list of active processes, if a
         process ends before we attempt to read the process' information, then
         this should not trigger an error.
         """
-        listdir_mock = self.mocker.replace("os.listdir")
-        listdir_mock("/proc")
-        self.mocker.result(["12345"])
 
         class FakeFile(object):
 
@@ -67,20 +67,21 @@
             def close(self):
                 self.closed = True
 
-        open_mock = self.mocker.replace("__builtin__.open")
-        open_mock("/proc/12345/cmdline", "r")
+        list_dir_mock.return_value = ["12345"]
         fakefile1 = FakeFile("test-binary")
-        self.mocker.result(fakefile1)
-
-        open_mock("/proc/12345/status", "r")
         fakefile2 = FakeFile(None)
-        self.mocker.result(fakefile2)
-
-        self.mocker.replay()
-
-        process_info = ProcessInformation("/proc")
-        processes = list(process_info.get_all_process_info())
+
+        with mock.patch("__builtin__.open", mock.mock_open()) as open_mock:
+            # This means "return fakefile1, then fakefile2"
+            open_mock.side_effect = [fakefile1, fakefile2]
+            process_info = ProcessInformation("/proc")
+            processes = list(process_info.get_all_process_info())
+            calls = [
+                mock.call("/proc/12345/cmdline", "r"),
+                mock.call("/proc/12345/status", "r")]
+            open_mock.assert_has_calls(calls)
         self.assertEqual(processes, [])
+        list_dir_mock.assert_called_with("/proc")
         self.assertTrue(fakefile1.closed)
         self.assertTrue(fakefile2.closed)