Merge lp:~gocept/landscape-client/py3-manager-shutdownmanager-aptsources into lp:~landscape/landscape-client/trunk

[Steffen Allner]

This is the py3 port of landscape.manager.shutdownmanager and l.m.aptsources.

There are a few bytes/unicode changes here. Also we solve some errback shenanigans with a temporary fix. A more correct fix is forthcoming.

This MP considers small changes for landscape.manager.shutdownmanager and l.m.aptsources.

The API version is considered to be bytes in the message schema.
The behavior of exceptions changed slightly with Python 3, i.e. to get the parameters passed during raise, we have to access execption.args as the exception on its own is not iterable anymore.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 986
Branch: lp:~gocept/landscape-client/py3-manager-shutdownmanager-aptsources
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3806/

review: Approve (test results)

[Adam Collard (adam-collard)]

review: Needs Fixing

[lp:~gocept/landscape-client/py3-manager-shutdownmanager-aptsources]

987. By Steffen Allner on 2017-03-29

Use an explicitly defined exception in the test to be not dependent on potential changes of errors in standard library.

[Steffen Allner (sallner)]

Good points, I will address those.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 987
Branch: lp:~gocept/landscape-client/py3-manager-shutdownmanager-aptsources
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3814/

review: Approve (test results)

[Michael Howitz (mh-gocept)]

LGTM.

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

Thanks for addressing Adam's comments and for opening that card about the errbacks.

review: Approve

=== modified file 'landscape/manager/aptsources.py'
--- landscape/manager/aptsources.py	2017-01-19 08:34:52 +0000
+++ landscape/manager/aptsources.py	2017-03-29 11:48:55 +0000
@@ -47,7 +47,7 @@
         Turn a signaled process command to a C{ProcessError}.
         """
         if not failure.check(ProcessError):
-            out, err, signal = failure.value
+            out, err, signal = failure.value.args
             raise ProcessError("%s\n%s" % (out, err))
         else:
             return failure

=== modified file 'landscape/manager/tests/test_aptsources.py'
--- landscape/manager/tests/test_aptsources.py	2017-01-19 08:34:52 +0000
+++ landscape/manager/tests/test_aptsources.py	2017-03-29 11:48:55 +0000
@@ -3,6 +3,7 @@
 import mock
 
 from twisted.internet.defer import Deferred, succeed
+from twisted.python.compat import _PY3
 
 from landscape.manager.aptsources import AptSources
 from landscape.manager.plugin import SUCCEEDED, FAILED
@@ -176,7 +177,10 @@
         If a failure happens during the manipulation of sources, the activity
         is reported as FAILED with the error message.
         """
-        self.sourceslist.SOURCES_LIST = "/doesntexist"
+        def buggy_source_handler(*args):
+            raise RuntimeError("foo")
+
+        self.sourceslist._handle_sources = buggy_source_handler
 
         self.manager.dispatch_message(
             {"type": "apt-sources-replace",
@@ -184,7 +188,7 @@
              "gpg-keys": [],
              "operation-id": 1})
 
-        msg = "OSError: [Errno 2] No such file or directory: '/doesntexist'"
+        msg = "RuntimeError: foo"
         service = self.broker_service
         self.assertMessages(service.message_store.get_pending_messages(),
                             [{"type": "operation-result",
@@ -352,7 +356,7 @@
         deferred = Deferred()
 
         def _run_process(command, args, env={}, path=None, uid=None, gid=None):
-            deferred.errback(("nok", "some error", 1))
+            deferred.errback(RuntimeError("nok", "some error", 1))
             return deferred
 
         self.sourceslist._run_process = _run_process

=== modified file 'landscape/manager/tests/test_shutdownmanager.py'
--- landscape/manager/tests/test_shutdownmanager.py	2014-08-28 09:47:21 +0000
+++ landscape/manager/tests/test_shutdownmanager.py	2017-03-29 11:48:55 +0000
@@ -43,7 +43,7 @@
             self.assertTrue(self.broker_service.exchanger.is_urgent())
             self.assertEqual(
                 self.broker_service.message_store.get_pending_messages(),
-                [{"type": "operation-result", "api": "3.2",
+                [{"type": "operation-result", "api": b"3.2",
                   "operation-id": 100, "timestamp": 10, "status": SUCCEEDED,
                   "result-text": u"Data may arrive in batches."}])
 
@@ -83,7 +83,7 @@
             self.assertTrue(self.broker_service.exchanger.is_urgent())
             self.assertEqual(
                 self.broker_service.message_store.get_pending_messages(),
-                [{"type": "operation-result", "api": "3.2",
+                [{"type": "operation-result", "api": b"3.2",
                   "operation-id": 100, "timestamp": 0, "status": FAILED,
                   "result-text": u"Failure text is reported."}])
 

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-29 11:48:55 +0000
+++ py3_ready_tests	2017-03-29 11:48:55 +0000
@@ -11,5 +11,5 @@
 landscape.manager.tests.test_scriptexecution
 landscape.manager.tests.test_customgraph
 landscape.manager.tests.test_usermanager
-
-
+landscape.manager.tests.test_shutdownmanager
+landscape.manager.tests.test_aptsources