Merge lp:~jelmer/brz/launchpad-test-fix into lp:brz

[Jelmer Vernooij]

Fix Launchpad registration test on Python 3.

[Martin Packman (gz)]

I feel like this requires a bit of an explanation on the branch over versions, but fair enough.

review: Approve

=== modified file 'breezy/plugins/launchpad/test_register.py'
--- breezy/plugins/launchpad/test_register.py	2018-06-27 21:56:53 +0000
+++ breezy/plugins/launchpad/test_register.py	2018-08-24 01:48:23 +0000
@@ -28,6 +28,7 @@
         Transport,
         )
 
+from ...sixish import PY3
 from ...tests import TestCaseWithTransport
 
 # local import
@@ -98,6 +99,7 @@
 
     # Python 2.5's xmlrpclib looks for this.
     _use_datetime = False
+    _use_builtin_types = False
 
     def __init__(self, testcase):
         self.testcase = testcase
@@ -111,10 +113,23 @@
             raise AssertionError()
         return InstrumentedXMLRPCConnection(test)
 
-    def send_request(self, connection, handler_path, request_body,
-                     verbose=None):
-        test = self.testcase
-        self.got_request = True
+    if PY3:
+        def send_request(self, host, handler_path, request_body,
+                         verbose=None):
+            self.connected_host = host
+            test = self.testcase
+            self.got_request = True
+            unpacked, method = xmlrpc_loads(request_body)
+            if None in unpacked:
+                raise AssertionError(
+                    "xmlrpc result %r shouldn't contain None" % (unpacked,))
+            self.sent_params = unpacked
+            return InstrumentedXMLRPCConnection(test)
+    else:
+        def send_request(self, connection, handler_path, request_body,
+                         verbose=None):
+            test = self.testcase
+            self.got_request = True
 
     def send_host(self, conn, host):
         pass

=== modified file 'python3.passing'
--- python3.passing	2018-08-23 10:19:35 +0000
+++ python3.passing	2018-08-24 01:48:23 +0000
@@ -1236,6 +1236,7 @@
 breezy.plugins.launchpad.test_lp_service.TestURLInference.test_staging_branch_url
 breezy.plugins.launchpad.test_lp_service.TestURLInference.test_staging_url
 breezy.plugins.launchpad.test_register.TestResolveLaunchpadPathRequest.test_mock_resolve_lp_url
+breezy.plugins.launchpad.test_register.TestResolveLaunchpadPathRequest.test_onto_transport
 breezy.plugins.launchpad.test_register.TestResolveLaunchpadPathRequest.test_subclass_request
 breezy.plugins.netrc_credential_store.tests.test_netrc.TestNetrcCSNoNetrc.test_home_netrc_does_not_exist
 breezy.plugins.netrc_credential_store.tests.test_netrc.TestNetrcCS.test_default_password