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

[Steffen Allner]

This MP brings landscape.broker.ping and its tests to Python 2/3 compatibility.

As a side effect the FakeReactor from landscape.reactor had to be ported too and is now also tested with Python 3.

This MP brings landscape.broker.ping and its tests to Python 2/3 compatibility.

As a side effect the FakeReactor from landscape.reactor had to be ported too and is now also tested with Python 3.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Eric Snow (ericsnowcurrently)]

Mostly LGTM. I have just one question.

review: Needs Information

[Steffen Allner (sallner)]

We need to land the broker.exchange branch first on /trunk to advance with this one.

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

[Daniel Havlik (nilo)]

+1

review: Approve

[🤖 Landscape Builder (landscape-builder)]

Attempt to merge into lp:landscape-client failed due to conflicts:

text conflict in py3_ready_tests

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

=== modified file 'landscape/broker/ping.py'
--- landscape/broker/ping.py	2017-03-17 09:26:45 +0000
+++ landscape/broker/ping.py	2017-03-28 16:12:53 +0000
@@ -33,7 +33,11 @@
 
 """
 
-import urllib
+try:
+    from urllib.parse import urlencode
+except ImportError:
+    from urllib import urlencode
+
 from logging import info
 
 from twisted.python.failure import Failure
@@ -65,7 +69,7 @@
         """
         if insecure_id is not None:
             headers = {"Content-Type": "application/x-www-form-urlencoded"}
-            data = urllib.urlencode({"insecure_id": insecure_id})
+            data = urlencode({"insecure_id": insecure_id})
             page_deferred = defer.Deferred()
 
             def errback(type, value, tb):

=== modified file 'landscape/reactor.py'
--- landscape/reactor.py	2017-01-05 09:07:23 +0000
+++ landscape/reactor.py	2017-03-28 16:12:53 +0000
@@ -296,9 +296,17 @@
     def call_later(self, seconds, f, *args, **kwargs):
         scheduled_time = self._current_time + seconds
         call = (scheduled_time, f, args, kwargs)
-        bisect.insort_left(self._calls, call)
+        self._insort_call(call)
         return FakeReactorID(call)
 
+    def _insort_call(self, call):
+        # We want to insert the call in the appropriate time slot. A simple
+        # bisect.insort_left() is not sufficient as the comparison of two
+        # methods is not defined in Python 3.
+        times = [c[0] for c in self._calls]
+        index = bisect.bisect_left(times, call[0])
+        self._calls.insert(index, call)
+
     def call_every(self, seconds, f, *args, **kwargs):
 
         def fake():

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-27 06:58:52 +0000
+++ py3_ready_tests	2017-03-28 16:12:53 +0000
@@ -4,10 +4,12 @@
 landscape.package.tests
 
 
+landscape.tests.test_reactor
 landscape.tests.test_schema
 
 
 
+landscape.broker.tests.test_ping
 
 landscape.broker.tests.test_exchange
 landscape.broker.tests.test_store