Merge lp:~ack/landscape-client/mocker-replace-test-customgraph into lp:~landscape/landscape-client/trunk

[Alberto Donato]

Replace mocker uses in test_customgraph.

Replace mocker uses in test_customgraph.

Testing instructions:

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 881
Branch: lp:~ack/landscape-client/mocker-replace-test-customgraph
Jenkins: https://ci.lscape.net/job/latch-test/5079/

review: Approve (test results)

[Bogdana Vereha (bogdana)]

+1

review: Approve

[Chris Glass (tribaal)]

+1

review: Approve

=== modified file 'landscape/manager/tests/test_customgraph.py'
--- landscape/manager/tests/test_customgraph.py	2014-08-28 09:47:21 +0000
+++ landscape/manager/tests/test_customgraph.py	2016-06-15 23:36:27 +0000
@@ -2,6 +2,8 @@
 import pwd
 import logging
 
+import mock
+
 from twisted.internet.error import ProcessDone
 from twisted.python.failure import Failure
 
@@ -10,10 +12,10 @@
 
 from landscape.tests.helpers import (
     LandscapeTest, ManagerHelper, StubProcessFactory, DummyProcess)
-from landscape.tests.mocker import ANY
 
 
 class CustomGraphManagerTests(LandscapeTest):
+
     helpers = [ManagerHelper]
 
     def setUp(self):
@@ -54,16 +56,14 @@
                            "graph-123"),
               username)])
 
-    def test_add_graph_unknown_user(self):
+    @mock.patch("pwd.getpwnam")
+    def test_add_graph_unknown_user(self, mock_getpwnam):
         """
         Attempting to add a graph with an unknown user should not result in an
         error, instead a message should be logged, the error will be picked up
         when the graph executes.
         """
-        mock_getpwnam = self.mocker.replace("pwd.getpwnam", passthrough=False)
-        mock_getpwnam("foo")
-        self.mocker.throw(KeyError("foo"))
-        self.mocker.replay()
+        mock_getpwnam.side_effect = KeyError("foo")
         error_message = "Attempt to add graph with unknown user foo"
         self.log_helper.ignore_errors(error_message)
         self.logger.setLevel(logging.ERROR)
@@ -78,23 +78,20 @@
         self.assertEqual(graph[0], 123)
         self.assertEqual(graph[2], u"foo")
         self.assertTrue(error_message in self.logfile.getvalue())
-
-    def test_add_graph_for_user(self):
-        mock_chown = self.mocker.replace("os.chown", passthrough=False)
-        mock_chown(ANY, 1234, 5678)
-
-        mock_chmod = self.mocker.replace("os.chmod", passthrough=False)
-        mock_chmod(ANY, 0700)
-
-        mock_getpwnam = self.mocker.replace("pwd.getpwnam", passthrough=False)
+        mock_getpwnam.assert_called_with("foo")
+
+    @mock.patch("os.chown")
+    @mock.patch("os.chmod")
+    @mock.patch("pwd.getpwnam")
+    def test_add_graph_for_user(self, mock_getpwnam, mock_chmod, mock_chown):
 
         class pwnam(object):
             pw_uid = 1234
             pw_gid = 5678
             pw_dir = self.makeFile()
 
-        self.expect(mock_getpwnam("bar")).result(pwnam)
-        self.mocker.replay()
+        mock_getpwnam.return_value = pwnam
+
         self.manager.dispatch_message(
             {"type": "custom-graph-add",
                      "interpreter": "/bin/sh",
@@ -107,6 +104,10 @@
                                 "graph-123"),
                    "bar")])
 
+        mock_chown.assert_called_with(mock.ANY, 1234, 5678)
+        mock_chmod.assert_called_with(mock.ANY, 0700)
+        mock_getpwnam.assert_called_with("bar")
+
     def test_remove_unknown_graph(self):
         self.manager.dispatch_message(
             {"type": "custom-graph-remove",
@@ -307,21 +308,19 @@
                   "type": "custom-graph"}])
         return result.addCallback(check)
 
-    def test_run_user(self):
+    @mock.patch("pwd.getpwnam")
+    def test_run_user(self, mock_getpwnam):
         filename = self.makeFile("some content")
         self.store.add_graph(123, filename, "bar")
         factory = StubProcessFactory()
         self.graph_manager.process_factory = factory
 
-        mock_getpwnam = self.mocker.replace("pwd.getpwnam", passthrough=False)
-
         class pwnam(object):
             pw_uid = 1234
             pw_gid = 5678
             pw_dir = self.makeFile()
 
-        self.expect(mock_getpwnam("bar")).result(pwnam)
-        self.mocker.replay()
+        mock_getpwnam.return_value = pwnam
 
         result = self.graph_manager.run()
 
@@ -333,6 +332,7 @@
         self.assertEqual(spawn[4], "/")
         self.assertEqual(spawn[5], 1234)
         self.assertEqual(spawn[6], 5678)
+        mock_getpwnam.assert_called_with("bar")
 
         self._exit_process_protocol(spawn[0], "spam")
 
@@ -365,11 +365,9 @@
 
         return result.addCallback(check)
 
-    def test_run_unknown_user(self):
-        mock_getpwnam = self.mocker.replace("pwd.getpwnam", passthrough=False)
-        mock_getpwnam("foo")
-        self.mocker.throw(KeyError("foo"))
-        self.mocker.replay()
+    @mock.patch("pwd.getpwnam")
+    def test_run_unknown_user(self, mock_getpwnam):
+        mock_getpwnam.side_effect = KeyError("foo")
 
         self.manager.config.script_users = "foo"
 
@@ -389,6 +387,7 @@
                        "script-hash": "",
                        "values": []}},
                   "type": "custom-graph"}])
+            mock_getpwnam.assert_called_with("foo")
 
         return result.addCallback(check)