Merge lp:~robru/cupstream2distro/fix-test-mocks into lp:cupstream2distro

[Robert Bruce Park]

Fix test failures that only occur on some devices.

[lp:~robru/cupstream2distro/fix-test-mocks]

1112. By Robert Bruce Park on 2015-09-23

Stop breaking SourceSync.__bases__.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Hey Barry, so these small changes fix the errors that I was getting on just one of my laptops, can you confirm this branch fixes it for you, too? Also some comments inline.

review: Approve

[Barry Warsaw (barry)]

make check still fails for me:

python3 -m coverage run -m nose2
WARNING:root:Silo name list not found, run setup_citrain.py.
...............................................................................................................................FF..F......................................................................................................................................................................................................................................................................................
======================================================================
FAIL: test_generate_package_diffs_bluez (tests.unit.test_packagemanager.PackageManagerTests)
Find packaging changes in a recent bluez landing.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/mock/mock.py", line 1305, in patched
    return func(*args, **keywargs)
  File "/home/barry/projects/ubuntu/cupstream2distro/mocks/tests/unit/test_packagemanager.py", line 315, in test_generate_package_diffs_bluez
    self.assertEqual(diff.read().strip(), s.PACKAGING_BLUEZ_DEBDIFF)
  File "/home/barry/projects/ubuntu/cupstream2distro/mocks/tests/unit/__init__.py", line 98, in assertEqual
    super().assertEqual(first, second, *args, **kwargs)
AssertionError: "/!\\[82 chars].\n\ndiff -Nru bluez-4.101/debian/changelog bl[2623 chars]atch" != "/!\\[82 chars].\n\n--- bluez-4.101/debian/changelog\n+++ blu[2115 chars]atch"
  /!\ This diff contains only packaging and build tools.
  It is not a full content diff.

- diff -Nru bluez-4.101/debian/changelog bluez-4.101/debian/changelog
  --- bluez-4.101/debian/changelog
  +++ bluez-4.101/debian/changelog
  @@ -1,3 +1,11 @@
  +bluez (4.101-0ubuntu24) vivid; urgency=medium
  +
  + * dont_enable_discoverable_during_init_with_if_valid_timeout.patch:
  + - Backport from upstream to avoid enabling discoverable if there is a
  + valid timeout value (LP: #1419874)
  +
  + -- Ricardo Salveti de Araujo <email address hidden> Sun, 08 Mar 2015 18:47:09 -0300
  +
   bluez (4.101-0ubuntu22) vivid; urgency=medium

     * debian/patches/fix_armhf_hcigetconninfo_free.patch: drop, fails in some
- diff -Nru bluez-4.101/debian/patches/dont_enable_discoverable_during_init_with_if_valid_timeout.patch bluez-4.101/debian/patches/dont_enable_discoverable_during_init_with_if_valid_timeout.patch
  --- bluez-4.101/debian/patches/dont_enable_discoverable_during_init_with_if_valid_timeout.patch
  +++ bluez-4.101/debian/patches/dont_enable_discoverable_during_init_with_if_valid_timeout.patch
  @@ -0,0 +1,14 @@
  +Author: Ricardo Salveti de Araujo <email address hidden>
  +Description: Don't enable discoverable during init if timeout is valid
  +
  +Backport of the upstream patch 8819626.
  +
  +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/1419874
  +
  +Index: bluez-4.101/plugins/mgmtops.c
  +===================================================================
  +--- bluez-4.101.orig/plugins/mgmtops.c
  ++++ bluez-4.101/plugins/mgmtops.c
  +@@ -223,7 +223,8 @@ static int mgmt_set_discoverable(int ind
  + ...

[Robert Bruce Park (robru)]

That doesn't even make sense, I haven't changed any debdiff logic in a long time. Why would it drop the 'diff -Nru' line? is your debdiff configured differently?

[Robert Bruce Park (robru)]

That failure is different anyway than what I've fixed here, so I'll approve this for now.

review: Approve

=== modified file 'tests/unit/test_recipe_merge.py'
--- tests/unit/test_recipe_merge.py	2015-09-09 00:14:07 +0000
+++ tests/unit/test_recipe_merge.py	2015-09-23 03:43:24 +0000
@@ -192,10 +192,12 @@
 
     @patch('citrain.recipes.merge.Rev')
     @patch('citrain.recipes.merge.reorder_branches')
+    @patch('citrain.recipes.merge.Merge.merge_branch', Mock())
     @patch('citrain.recipes.merge.Merge.identify_versions', Mock())
     @patch('citrain.recipes.merge.Merge.get_package_version', Mock())
     @patch('citrain.recipes.merge.Merge.generate_commit_message', Mock())
     @patch('citrain.recipes.merge.Merge.verify_changelog_versions', Mock())
+    @patch('citrain.recipes.merge.Merge.get_remote_branch_authors', Mock())
     def test_merge_collect_phase(self, rb_mock, rev_mock):
         """Prepare merges for building."""
         Merge.all_mps = {
@@ -237,7 +239,10 @@
 
     @patch('citrain.recipes.merge.lp')
     @patch('citrain.recipes.merge.name_ppa')
+    @patch('citrain.recipes.merge.Merge.release_branch', Mock())
     @patch('citrain.recipes.merge.Merge.get_package_version', Mock())
+    @patch('citrain.recipes.merge.Merge.get_archive_version', Mock())
+    @patch('citrain.recipes.merge.Merge.preserve_package_version', Mock())
     @patch('citrain.recipes.merge.Merge.verify_changelog_versions', Mock())
     @patch('citrain.recipes.merge.Merge.collect_changelog_contents', Mock())
     def test_merge_identify_versions(self, np_mock, lp_mock, is_distro=True):
@@ -324,6 +329,8 @@
             merge.identify_approvers(lp_mp),
             '\nApproved by: Bob')
 
+    @patch('citrain.recipes.merge.Merge.get_archive_version', Mock())
+    @patch('citrain.recipes.merge.Merge.get_package_version', Mock())
     def test_merge_verify_changelog_versions(self):
         """Halt build if distro version is missing from trunk."""
         merge = Merge('bang', self.series, self.dest, self.ppa)
@@ -336,11 +343,11 @@
         merge.get_package_version.return_value = '1.0'
         merge.verify_changelog_versions()
         env.FORCE_REBUILD = 'false'
-        print(merge.verify_changelog_versions)
-        print(merge.get_archive_version())
         with self.assertRaisesRegexp(BuildError, 'missing from the changelog'):
             merge.verify_changelog_versions()
 
+    @patch('citrain.recipes.merge.Merge.debian_changelog', Mock())
+    @patch('citrain.recipes.merge.Merge.get_branch_commits', Mock())
     def test_merge_collect_changelog_contents(self):
         """Collect author & bug data for generating changelogs."""
         merge = Merge('foo-pack', self.series, self.dest, self.ppa)

=== modified file 'tests/unit/test_script_revert.py'
--- tests/unit/test_script_revert.py	2015-08-21 20:32:59 +0000
+++ tests/unit/test_script_revert.py	2015-09-23 03:43:24 +0000
@@ -34,7 +34,7 @@
 
     def setUp(self):
         super().setUp()
-        self.script.SourceSync.__bases__ = (fake_factory(),)
+        self.script.Revert.__bases__ = (fake_factory(),)
         self.revert = self.script.Revert()
         self.revert.name = 'regress'
         self.revert.series = Mock(version='15.04')