Merge lp:~gocept/landscape-client/py3-sysinfo into lp:~landscape/landscape-client/trunk

[Steffen Allner]

Update landscape.sysinfo tests to work with python 2.x and 3.x.

We are on the journey to Python 2/3 compatibility.

This MP considers landscape.sysinfo module, where only a few tests had to be ported. First, mocking builtins works different now. Second, SystemExit lost his .message attribute, .code can be used instead.

[lp:~gocept/landscape-client/py3-sysinfo]

971. By Steffen Allner on 2017-03-14

In Python 3 we have to give the full python path for mocking builtins, also generalize assertions and move them outside the mocking with statement to make it clearer what is mocked.

972. By Steffen Allner on 2017-03-14

SystemExit lost its .message but kept its .code attribute.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 972
Branch: lp:~gocept/landscape-client/py3-sysinfo
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3620/

review: Approve (test results)

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

Looks good, I'd just start adding tests to py3_ready_test as we go along.

review: Approve

[lp:~gocept/landscape-client/py3-sysinfo]

973. By Steffen Allner on 2017-03-15

Backmerge from trunk

974. By Steffen Allner on 2017-03-15

Increase tests executed with Python 3.

[Steffen Allner (sallner)]

I am happy to do that her too. We have no the complete landscape.lib covered \O/.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 974
Branch: lp:~gocept/landscape-client/py3-sysinfo
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3624/

review: Approve (test results)

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

Please make sure Daniel (or someone else) from Gocept does a review too so we can get this landed.

review: Approve

[Michael Howitz (mh-gocept)]

Looks good to me.

review: Approve

=== modified file 'landscape/sysinfo/tests/test_deployment.py'
--- landscape/sysinfo/tests/test_deployment.py	2017-03-13 15:15:46 +0000
+++ landscape/sysinfo/tests/test_deployment.py	2017-03-15 08:40:47 +0000
@@ -62,6 +62,7 @@
     """
     Something that's simpler and more reusable than a bunch of mocked objects.
     """
+
     def __init__(self):
         self.queued_calls = []
         self.scheduled_calls = []
@@ -135,6 +136,7 @@
         # thus firing the callback and writing sysinfo out to stdout.
         sysinfo = SysInfoPluginRegistry()
         original_sysinfo_run = sysinfo.run
+
         def wrapped_sysinfo_run(*args, **kwargs):
             original_sysinfo_run(*args, **kwargs)
             return deferred
@@ -252,23 +254,26 @@
 
     def test_setup_logging_logs_to_var_log_if_run_as_root(self):
         with mock.patch.object(os, "getuid", return_value=0) as mock_getuid, \
-             mock.patch.object(
-                 os.path, "isdir", return_value=False) as mock_isdir, \
-             mock.patch.object(os, "mkdir") as mock_mkdir, \
-             mock.patch("__builtin__.open") as mock_open:
+                mock.patch.object(
+                    os.path, "isdir", return_value=False) as mock_isdir, \
+                mock.patch.object(os, "mkdir") as mock_mkdir, \
+                mock.patch("logging.open") as mock_open:
             logger = getLogger("landscape-sysinfo")
             self.assertEqual(logger.handlers, [])
 
             setup_logging()
-            mock_getuid.assert_called_with()
-            mock_isdir.assert_called_with("/var/log/landscape")
-            mock_mkdir.assert_called_with("/var/log/landscape")
-            mock_open.assert_called_with("/var/log/landscape/sysinfo.log", "a")
 
-            handler = logger.handlers[0]
-            self.assertTrue(isinstance(handler, RotatingFileHandler))
-            self.assertEqual(handler.baseFilename,
-                             "/var/log/landscape/sysinfo.log")
+        mock_getuid.assert_called_with()
+        mock_isdir.assert_called_with("/var/log/landscape")
+        mock_mkdir.assert_called_with("/var/log/landscape")
+        self.assertEqual(
+            mock_open.call_args_list[0][0],
+            ("/var/log/landscape/sysinfo.log", "a")
+        )
+        handler = logger.handlers[0]
+        self.assertTrue(isinstance(handler, RotatingFileHandler))
+        self.assertEqual(handler.baseFilename,
+                         "/var/log/landscape/sysinfo.log")
 
     def test_create_log_dir(self):
         log_dir = self.makeFile()
@@ -287,8 +292,8 @@
         io_error = IOError("Read-only filesystem.")
         with mock.patch(
                 "landscape.sysinfo.deployment.setup_logging",
-                side_effect=io_error) as setup_logging_mock:
+                side_effect=io_error):
             error = self.assertRaises(
                 SystemExit, run, ["--sysinfo-plugins", "TestPlugin"])
         self.assertEqual(
-            error.message, "Unable to setup logging. Read-only filesystem.")
+            error.code, "Unable to setup logging. Read-only filesystem.")

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-13 12:37:19 +0000
+++ py3_ready_tests	2017-03-15 08:40:47 +0000
@@ -1,22 +1,2 @@
-landscape/lib/tests/test_scriptcontent.py
-landscape/lib/tests/test_amp.py
-landscape/lib/tests/test_gpg.py
-landscape/lib/tests/test_sequenceranges.py
-landscape/lib/tests/test_bootstrap.py
-landscape/lib/tests/test_juju.py
-landscape/lib/tests/test_sysstats.py
-landscape/lib/tests/test_bpickle.py
-landscape/lib/tests/test_lock.py
-landscape/lib/tests/test_tag.py
-landscape/lib/tests/test_lsb_release.py
-landscape/lib/tests/test_timestamp.py
-landscape/lib/tests/test_disk.py
-landscape/lib/tests/test_monitor.py
-landscape/lib/tests/test_encoding.py
-landscape/lib/tests/test_versioning.py
-landscape/lib/tests/test_fd.py
-landscape/lib/tests/test_persist.py
-landscape/lib/tests/test_vm_info.py
-landscape/lib/tests/test_fetch.py
-landscape/lib/tests/test_process.py
-landscape/lib/tests/test_warning.py
+landscape.lib.tests
+landscape.sysinfo.tests