Merge lp:~robru/cupstream2distro/fix-watching-new-sources into lp:cupstream2distro

[Robert Bruce Park]

Fix supported arch list for new source packages.

Fix supported arch list for new source packages.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

review: Approve

=== modified file 'citrain/watch_ppa.py'
--- citrain/watch_ppa.py	2014-12-03 05:25:41 +0000
+++ citrain/watch_ppa.py	2015-01-13 17:51:26 +0000
@@ -90,14 +90,16 @@
     package.
     """
     series = lp.load(silo_state.series)
-    source_collection = dest.getPublishedSources(
-        exact_match=True,
-        source_name=source_name,
-        distro_series=series,
-        status='Published',
-    )
-    previous_source = packagemanager.sort_by_date_created(source_collection)[0]
-    for binary in previous_source.getPublishedBinaries():
+    source_collection = packagemanager.sort_by_date_created(
+        dest.getPublishedSources(
+            exact_match=True,
+            source_name=source_name,
+            distro_series=series,
+            status='Published',
+        ))
+    if not source_collection:
+        return
+    for binary in source_collection[0].getPublishedBinaries():
         # Must check architecture_specific field to filter out false positives
         # caused by Arch:all packages showing up even on arches that we don't
         # expect builds to succeed on.

=== modified file 'tests/unit/test_script_watch_ppa.py'
--- tests/unit/test_script_watch_ppa.py	2014-12-03 06:12:10 +0000
+++ tests/unit/test_script_watch_ppa.py	2015-01-13 17:51:26 +0000
@@ -139,6 +139,28 @@
         self.script.packagemanager.sort_by_date_created\
             .assert_called_once_with(dest.getPublishedSources())
 
+    def test_find_supported_arches_none(self):
+        """Return set() when no package exists at destination."""
+        binaries = []
+        source = Mock()
+        source.getPublishedBinaries.return_value = binaries
+        dest = Mock()
+        dest.getPublishedSources.return_value = [source]
+        self.script.packagemanager.sort_by_date_created.return_value = []
+        self.assertEqual(
+            sorted(self.script.find_supported_arches(dest, 'foo')),
+            [])
+        self.script.lp.load.assert_called_once_with(
+            self.script.silo_state.series)
+        dest.getPublishedSources.assert_called_once_with(
+            exact_match=True,
+            source_name='foo',
+            distro_series=self.script.lp.load(),
+            status='Published',
+        )
+        self.script.packagemanager.sort_by_date_created\
+            .assert_called_once_with(dest.getPublishedSources())
+
     def test_find_all_uploaded(self):
         """Find everything that has been uploaded from this silo."""
         self.script.find_all.return_value = [