Merge lp:~robru/cupstream2distro/fix-dual-diffing into lp:cupstream2distro

[Robert Bruce Park]

When generating diffs, diff against the correct DSCs.

Some old diffing code would just glob over *dsc, that code worked great in the days before dual silos, but with dual silos what happens is that it diffs wily vs wily, then it diffs vivid vs wily, and the vivid diff overwrites the wily diff. Even this wasn't so bad until recently, because normally the only difference between wily and vivid was just the first line of the debian/changelog. But now some people are experimenting with source packages that do all kinds of voodoo differently depending on what release they're building for, so now diffing the vivid build against the package in wily is producing all kinds of noise.

This branch drops a glob to ensure that only the correct package is diffed against the version in the correct ubuntu release.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Looks great in staging.

review: Approve

=== modified file 'citrain/recipes/base.py'
--- citrain/recipes/base.py	2015-09-22 18:51:46 +0000
+++ citrain/recipes/base.py	2015-09-22 21:33:32 +0000
@@ -315,9 +315,11 @@
             archive = self.dest if dest_version else self.main_archive
             self.get_from_archive(path, archive=archive, status='Published')
             dsc = '{}_*.dsc'.format(self.name)
+            our_version = self.get_package_version().split(':')[-1]  # No epoch
+            new_dsc = dsc.replace('*', our_version)
+            log_value_of.new_dsc('Diffing')
             for old in glob(SILO_DIR('ubuntu', self.name, dsc)) or [None]:
-                for new in glob(SILO_DIR(dsc)):
-                    self.generate_package_diffs(old, new)
+                self.generate_package_diffs(old, SILO_DIR(new_dsc))
 
     @staticmethod
     def post_checkstatus_phase(silo_state):

=== modified file 'tests/unit/test_recipe_base.py'
--- tests/unit/test_recipe_base.py	2015-09-22 18:51:46 +0000
+++ tests/unit/test_recipe_base.py	2015-09-22 21:33:32 +0000
@@ -379,11 +379,13 @@
 
     @patch('citrain.recipes.base.glob')
     @patch('citrain.recipes.base.newest')
+    @patch('citrain.recipes.base.BuildBase.get_from_archive', Mock())
+    @patch('citrain.recipes.base.BuildBase.get_package_version', Mock())
     def test_buildbase_diff_phase(self, new_mock, glob_mock):
         """Generate a diff between our build & what's at dest."""
-        glob_results = [['new_dsc'], ['old_dsc']]
-        glob_mock.side_effect = lambda *i: glob_results.pop()
+        glob_mock.return_value = ['old_dsc']
         build = BuildBase('bar', self.series, self.dest, self.ppa)
+        build.get_package_version.return_value = '5:1.0-0ubuntu1'
         build.path = self.tempdir
         build.get_from_archive = Mock()
         build.generate_package_diffs = Mock()
@@ -394,16 +396,18 @@
             archive=build.dest,
             status='Published')
         build.generate_package_diffs.assert_called_once_with(
-            'old_dsc', 'new_dsc')
+            'old_dsc', self.tempdir + '/bar_1.0-0ubuntu1.dsc')
         new_mock.assert_called_once_with(build.dest, source_name='bar')
 
     @patch('citrain.recipes.base.glob')
     @patch('citrain.recipes.base.newest')
+    @patch('citrain.recipes.base.BuildBase.get_from_archive', Mock())
+    @patch('citrain.recipes.base.BuildBase.get_package_version', Mock())
     def test_buildbase_diff_phase_new_source(self, new_mock, glob_mock):
         """Indicate that this package was never released at dest."""
-        glob_results = [['new_dsc'], []]
-        glob_mock.side_effect = lambda *i: glob_results.pop()
+        glob_mock.return_value = []
         build = BuildBase('bar', self.series, self.dest, self.ppa)
+        build.get_package_version.return_value = '5:1.0-0ubuntu1'
         build.path = self.tempdir
         build.get_from_archive = Mock()
         build.generate_package_diffs = Mock()
@@ -413,17 +417,20 @@
             join(self.tempdir, 'ubuntu', 'bar'),
             archive=build.dest,
             status='Published')
-        build.generate_package_diffs.assert_called_once_with(None, 'new_dsc')
+        build.generate_package_diffs.assert_called_once_with(
+            None, self.tempdir + '/bar_1.0-0ubuntu1.dsc')
         new_mock.assert_called_once_with(build.dest, source_name='bar')
 
     @patch('citrain.recipes.base.glob')
     @patch('citrain.recipes.base.newest')
+    @patch('citrain.recipes.base.BuildBase.get_from_archive', Mock())
+    @patch('citrain.recipes.base.BuildBase.get_package_version', Mock())
     def test_buildbase_diff_phase_dest_ppa(self, new_mock, glob_mock):
         """Generate diff from main archive when dest PPA missing source."""
-        glob_results = [['new_dsc'], []]
-        glob_mock.side_effect = lambda *i: glob_results.pop()
+        glob_mock.return_value = []
         new_mock.return_value = None
         build = BuildBase('bar', self.series, self.dest, self.ppa)
+        build.get_package_version.return_value = '6:2.0-0ubuntu1'
         build.path = self.tempdir
         build.get_from_archive = Mock()
         build.generate_package_diffs = Mock()
@@ -433,7 +440,8 @@
             join(self.tempdir, 'ubuntu', 'bar'),
             archive=build.main_archive,
             status='Published')
-        build.generate_package_diffs.assert_called_once_with(None, 'new_dsc')
+        build.generate_package_diffs.assert_called_once_with(
+            None, self.tempdir + '/bar_2.0-0ubuntu1.dsc')
 
     def test_buildbase_post_checkstatus_phase(self):
         """Silently allow publication when no problems found."""