launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/trusty-python-apt into lp:launchpad.

Commit message:
Tolerate changed error message in trusty's python-apt.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/trusty-python-apt/+merge/251732

Tolerate changed error message in trusty's python-apt.

We'll need this in preparation for upgrading to trusty.  More immediately, we need it in preparation for upgrading to a backported version of trusty's python-apt, which we need to fix ABI issues between python-apt and the backported apt running in production.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/trusty-python-apt into lp:launchpad.

=== modified file 'lib/lp/archiveuploader/tests/test_nascentuploadfile.py'
--- lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2015-01-28 17:56:31 +0000
+++ lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2015-03-04 13:16:42 +0000
@@ -13,6 +13,12 @@
     Changes,
     Dsc,
     )
+from testtools.matchers import (
+    Contains,
+    Equals,
+    MatchesAny,
+    MatchesListwise,
+    )
 
 from lp.archiveuploader.changesfile import ChangesFile
 from lp.archiveuploader.dscfile import DSCFile
@@ -411,9 +417,11 @@
         uploadfile = self.createDebBinaryUploadFile(
             "empty_0.1_all.deb", "main/admin", "extra", "empty", "0.1", None,
             members=[])
-        self.assertEqual(
-            ["No debian archive, missing control.tar.gz"],
-            ["".join(error.args) for error in uploadfile.verifyDebTimestamp()])
+        self.assertThat(
+            ["".join(error.args) for error in uploadfile.verifyDebTimestamp()],
+            MatchesListwise([MatchesAny(
+                Equals("No debian archive, missing control.tar.gz"),
+                Contains("could not locate member control.tar."))]))
 
     def test_storeInDatabase(self):
         # storeInDatabase creates a BinaryPackageRelease.