Merge lp:~robru/cupstream2distro/monkeypatch-lazr into lp:cupstream2distro

[Robert Bruce Park]

Workaround heinous lazr+lplib horribleness.

[lp:~robru/cupstream2distro/monkeypatch-lazr]

1078. By Robert Bruce Park on 2015-09-02

Add bug reference to comment.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1077
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/741/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/741/rebuild

review: Approve (continuous-integration)

[Steve Langasek (vorlon)]

LGTM.

review: Approve

=== modified file 'citrain/recipes/base.py'
--- citrain/recipes/base.py	2015-09-02 03:52:33 +0000
+++ citrain/recipes/base.py	2015-09-02 21:34:27 +0000
@@ -58,6 +58,22 @@
 )
 
 
+# FIXME: this needs to be fixed upstream. Workaround for this traceback:
+#   File "citrain/recipes/base.py", line 282, in checkupload_phase
+#     exact_match=True)[0]
+#   File "lazr/restfulclient/resource.py", line 853, in __getitem__
+#     found_slice = self._get_slice(slice(key, key + 1))
+#   File "lazr/restfulclient/resource.py", line 903, in _get_slice
+#     self._wadl_resource.url, 'ws.start', start)
+#   File "lazr/restfulclient/resource.py", line 976, in _with_url_query_...
+#     uri.query = urllib.urlencode(params, True)
+# AttributeError: 'module' object has no attribute 'urlencode'
+# https://bugs.launchpad.net/launchpad/+bug/821366
+from urllib.parse import urlencode
+from lazr.restfulclient import resource
+resource.urllib.urlencode = urlencode
+
+
 # This defines packages which must be uploaded together in pairs, or 'twins'.
 TWINS = {
     'qt3d-opensource-src': 'qt3d-opensource-src-gles',
@@ -279,14 +295,23 @@
             source_name=self.name,
             status='Published',
             pocket='Release',
-            exact_match=True)[0]
+            exact_match=True)
+        # In the event this source package is NEW, checkUpload fails horribly,
+        # so we must substitute flashplugin-nonfree/universe as defaults in
+        # order to confirm the publisher has legit upload rights for something.
+        kwargs = dict(
+            distroseries=self.series,
+            sourcepackagename='flashplugin-nonfree',
+            component='universe',
+            pocket='Proposed',
+            person=self.blame)
+        if sourcepub:
+            kwargs.update(
+                component=sourcepub[0].component_name,
+                sourcepackagename=self.name)
+        log_value_of.kwargs('self.dest.checkUpload')
         try:
-            self.dest.checkUpload(
-                component=sourcepub.component_name,
-                sourcepackagename=self.name,
-                distroseries=self.series,
-                pocket='Proposed',
-                person=self.blame)
+            self.dest.checkUpload(**kwargs)
             self.authorized = True
         except ClientError:
             self.authorized = False

=== modified file 'tests/unit/test_recipe_base.py'
--- tests/unit/test_recipe_base.py	2015-09-02 03:32:52 +0000
+++ tests/unit/test_recipe_base.py	2015-09-02 21:34:27 +0000
@@ -443,6 +443,30 @@
         self.assertTrue(build.authorized)
 
     @patch('citrain.recipes.base.lp')
+    def test_buildbase_checkupload_phase_NEW(self, lp_mock):
+        """Ensure that we call checkupload correctly for NEW packages."""
+        robru = Mock()
+        env.BUILD_USER_ID = 'robru'
+        lp_mock.people = dict(robru=robru)
+        build = BuildBase('qt', self.series, self.dest, self.ppa)
+        build.blame = robru
+        build.dest.getPublishedSources.return_value = None
+        build.checkupload_phase()
+        build.dest.getPublishedSources.assert_called_once_with(
+            distro_series=self.series,
+            status='Published',
+            pocket='Release',
+            exact_match=True,
+            source_name='qt')
+        build.dest.checkUpload.assert_called_once_with(
+            component='universe',
+            distroseries=self.series,
+            sourcepackagename='flashplugin-nonfree',
+            pocket='Proposed',
+            person=robru)
+        self.assertTrue(build.authorized)
+
+    @patch('citrain.recipes.base.lp')
     def test_buildbase_checkupload_phase_failed(self, lp_mock):
         """Ensure that we report invalid upload rights."""
         src = Mock()
@@ -474,7 +498,7 @@
 
     @patch('citrain.recipes.base.exists', Mock(return_value=True))
     def test_buildbase_ackaging_phase_authorized_unauthorized(self):
-        """Ensure that authorized people can ACK."""
+        """Ensure that unauthorized people can't ACK."""
         env.ACK_PACKAGING = 'true'
         build = BuildBase('qt', self.series, self.dest, self.ppa)
         build.authorized = False