launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/misc-bionic-test-failures into lp:launchpad.

Commit message:
Relax a few tests to allow them to pass on bionic.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/misc-bionic-test-failures/+merge/366625
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/misc-bionic-test-failures into lp:launchpad.

=== modified file 'lib/lp/archiveuploader/tests/test_utils.py'
--- lib/lp/archiveuploader/tests/test_utils.py	2018-05-03 15:10:39 +0000
+++ lib/lp/archiveuploader/tests/test_utils.py	2019-04-28 17:27:53 +0000
@@ -292,8 +292,8 @@
         self.assertIs(None, re_issource.match('foo-bar_1.0.diff.xz'))
 
 
-class DdpkgExtractSourceTests(TestCase):
-    """Tests for dpkg_extract_source."""
+class TestExtractDpkgSource(TestCase):
+    """Tests for extract_dpkg_source."""
 
     def test_simple(self):
         # unpack_source unpacks in a temporary directory and returns the
@@ -307,9 +307,10 @@
             ["THIS_IS_BAR", "debian"],
             os.listdir(os.path.join(temp_dir, "bar-1.0")))
 
-    def test_nonexistant(self):
+    def test_nonexistent(self):
         temp_dir = self.makeTemporaryDirectory()
         err = self.assertRaises(
             DpkgSourceError, extract_dpkg_source,
             "thispathdoesntexist", temp_dir)
-        self.assertEqual(2, err.result)
+        self.assertNotEqual(0, err.result)
+        self.assertEqual("", err.output)

=== modified file 'lib/lp/soyuz/doc/fakepackager.txt'
--- lib/lp/soyuz/doc/fakepackager.txt	2018-05-27 18:32:33 +0000
+++ lib/lp/soyuz/doc/fakepackager.txt	2019-04-28 17:27:53 +0000
@@ -112,7 +112,7 @@
     ...
      ... devel optional biscuit_1.0-1.dsc
      ... devel optional biscuit_1.0.orig.tar.gz
-     ... devel optional biscuit_1.0-1.diff.gz
+     ... devel optional biscuit_1.0-1.diff.gz...
     <BLANKLINE>
 
 When we try to build an incompatible package version an error will be

=== modified file 'lib/lp/translations/utilities/doc/gettext_mo_exporter.txt'
--- lib/lp/translations/utilities/doc/gettext_mo_exporter.txt	2014-01-30 09:58:18 +0000
+++ lib/lp/translations/utilities/doc/gettext_mo_exporter.txt	2019-04-28 17:27:53 +0000
@@ -88,16 +88,19 @@
     >>> tarfile = string_to_tarfile(file_content)
     >>> for member in tarfile.getmembers():
     ...     if member.isreg():
-    ...         lines = len(tarfile.extractfile(member).readlines())
+    ...         size = len(tarfile.extractfile(member).read())
+    ...         desc = 'non-empty' if size else 'empty'
+    ...     elif member.isdir():
+    ...         desc = 'dir'
     ...     else:
-    ...         lines = 0
-    ...     print "| %5d | %s" % (lines, member.name)
-    |     0 | es
-    |     0 | es/LC_MESSAGES
-    |    12 | es/LC_MESSAGES/foo.mo
-    |     0 | sr
-    |     0 | sr/LC_MESSAGES
-    |    12 | sr/LC_MESSAGES/foo.mo
+    ...         desc = 'unknown'
+    ...     print "| %9s | %s" % (desc, member.name)
+    | dir       | es
+    | dir       | es/LC_MESSAGES
+    | non-empty | es/LC_MESSAGES/foo.mo
+    | dir       | sr
+    | dir       | sr/LC_MESSAGES
+    | non-empty | sr/LC_MESSAGES/foo.mo
 
 
 == PO compiler helper class ==