Merge lp:~gary/launchpad/bug988541 into lp:launchpad

[Gary Poster]

Make some tests less likely to fail intermittently because of ordering issues.

This is a simple change to make tests better handle ordering issues, which show up intermittently (see bug 988541). AFAICT the order is not important, so I changed the comparison to sets. Subsequently these tests pass reliably.

[Brad Crittenden (bac)]

Changing to not care about ordering looks reasonable to me, Gary.

As discussed on IRC I think assertContentEqual would do an unordered comparison.

review: Approve (code)

[Gary Poster (gary)]

Cool, makes sense. Changed. Thank you!

=== modified file 'lib/lp/soyuz/tests/test_packagecloner.py'
--- lib/lp/soyuz/tests/test_packagecloner.py	2012-01-01 02:58:52 +0000
+++ lib/lp/soyuz/tests/test_packagecloner.py	2012-04-26 21:27:30 +0000
@@ -434,8 +434,8 @@
             return tuples
         actual_changed_tuples = get_tuples(actual_changed_keys)
         actual_new_tuples = get_tuples(actual_new_keys)
-        self.assertEqual(expected_changed_tuples, actual_changed_tuples)
-        self.assertEqual(expected_new_tuples, actual_new_tuples)
+        self.assertContentEqual(expected_changed_tuples, actual_changed_tuples)
+        self.assertContentEqual(expected_new_tuples, actual_new_tuples)
 
     def testPackageSetDiffWithNothingNew(self):
         """Test packageSetDiff."""