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

[Steffen Allner]

This is the port of landscape.broker.amp to Python 3.

This involved adjusting to the change in dict.keys().

This MP contains the last fixes to the landscape.broker module in order to run it with python3.

First, we need a list in broker.amp to get a serialized version of the data, which does not work with dict_keys. Also the assertion dict_values([]) != [] breaks tests, so I adapted them to use the length for testing for an empty iterable.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Daniel Havlik (nilo)]

+1

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

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)]

No approved revision specified.

=== modified file 'landscape/broker/amp.py'
--- landscape/broker/amp.py	2017-01-09 16:10:31 +0000
+++ landscape/broker/amp.py	2017-03-27 07:39:05 +0000
@@ -29,7 +29,7 @@
             the given event types occurs in the broker reactor, the associated
             callable will be fired.
         """
-        result = self.listen_events(handlers.keys())
+        result = self.listen_events(list(handlers.keys()))
         return result.addCallback(
             lambda args: handlers[args[0]](**args[1]))
 

=== modified file 'landscape/broker/tests/test_server.py'
--- landscape/broker/tests/test_server.py	2016-06-01 12:46:51 +0000
+++ landscape/broker/tests/test_server.py	2017-03-27 07:39:05 +0000
@@ -147,9 +147,9 @@
         client components that need to communicate with the server. After
         the registration they can be fetched with L{BrokerServer.get_clients}.
         """
-        self.assertEqual(self.broker.get_clients(), [])
+        self.assertEqual(len(self.broker.get_clients()), 0)
         self.assertEqual(self.broker.get_client("test"), None)
-        self.assertEqual(self.broker.get_connectors(), [])
+        self.assertEqual(len(self.broker.get_connectors()), 0)
         self.assertEqual(self.broker.get_connector("test"), None)
 
         def assert_registered(ignored):

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-27 07:39:05 +0000
+++ py3_ready_tests	2017-03-27 07:39:05 +0000
@@ -6,8 +6,8 @@
 
 landscape.tests.test_schema
 
-
-
+landscape.broker.tests.test_amp
+landscape.broker.tests.test_server
 
 landscape.broker.tests.test_exchange
 landscape.broker.tests.test_store