Merge lp:~barry/update-manager/lp1295392 into lp:update-manager

[Barry Warsaw]

[Sebastien Bacher (seb128)]

The bug pointed has been fixed by that commit it seems
http://bazaar.launchpad.net/~ubuntu-core-dev/update-manager/main/revision/2672

Not sure if the change proposed there still make sense in that context ... Michael?

[Barry Warsaw (barry)]

It's probably still relevant, but I'll let mvo decide.

[Michael Vogt (mvo)]

Thanks Barry and Seb - I think the mock_randint change is good to have, I tweaked the test a bit to include on ignored_src and one install_src (before one of the sets was always empty).

review: Approve

=== modified file 'tests/test_update_list.py'
--- tests/test_update_list.py	2013-06-06 05:50:56 +0000
+++ tests/test_update_list.py	2014-03-20 22:19:21 +0000
@@ -51,7 +51,9 @@
     def test_second_phased_binary_not_included(self):
         """ Test that there is no overlap between the source packages of the
             packages being ignored and installed """
-        self.updates_list.update(self.cache)
+        with patch.object(self.updates_list.random, "randint") as mock_randint:
+            mock_randint.return_value = 0
+            self.updates_list.update(self.cache)
         ignored_srcs = set([pkg.candidate.source_name for pkg in
                             self.updates_list.ignored_phased_updates])
         group = self.updates_list.update_groups[0]
@@ -92,7 +94,7 @@
         with patch.object(self.updates_list.random, "randint") as mock_randint:
             mock_randint.return_value = 100
             self.updates_list.update(self.cache)
-            self.assertUpdatesListLen(3)
+        self.assertUpdatesListLen(3)
 
 
 class GroupingTestCase(unittest.TestCase):