Merge lp:~laney/ubuntu-cdimage/fix-tests into lp:ubuntu-cdimage

[Iain Lane]

Fix torrent tests, then fix up pep8/pyflakes tests.

[Iain Lane (laney)]

Now ./run-tests works, for me at least!

[Steve Langasek (vorlon)]

review: Approve

=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2021-01-11 16:22:59 +0000
+++ lib/cdimage/livefs.py	2021-02-16 11:34:00 +0000
@@ -83,7 +83,8 @@
         # boards, thus specify subarch for livefs build. However, we
         # don't want +subarch in the published image names. Hence
         # default-arches does not specify anything.
-        # TODO add support to specify the above via image_format metadata_override.
+        # TODO add support to specify the above via image_format
+        # metadata_override.
         subarch = "hifive"
 
     return cpuarch, subarch
 
=== modified file 'lib/cdimage/tests/test_mirror.py'
--- lib/cdimage/tests/test_mirror.py	2021-02-16 11:34:00 +0000
+++ lib/cdimage/tests/test_mirror.py	2021-02-16 11:34:00 +0000
@@ -229,6 +229,7 @@
     def test_no_trigger_mirrors_when_stopped(self, mock_trigger_mirror):
         self.configure_triggers()
         os.mkdir(os.path.join(self.config.root, "etc"))
-        with open(os.path.join(self.config.root, "etc", "STOP_SYNC_MIRRORS"), "w"):
+        with open(os.path.join(self.config.root, "etc", "STOP_SYNC_MIRRORS"),
+                  "w"):
             trigger_mirrors(self.config)
             mock_trigger_mirror.assert_not_called()
 
=== modified file 'lib/cdimage/tests/test_static.py'
--- lib/cdimage/tests/test_static.py	2015-10-26 11:06:11 +0000
+++ lib/cdimage/tests/test_static.py	2021-02-16 11:34:00 +0000
@@ -92,7 +92,7 @@
             if line.startswith("#"):
                 continue
             line = line.rstrip()
-            canon_line = re.sub(r":[0-9]+:", ":*:", line, 1)
+            canon_line = re.sub(r":[0-9]+:(?:[0-9]+)?", ":*:", line, 1)
             canon_line = re.sub(r"line [0-9]+", "line *", canon_line)
             if canon_line not in exclusions:
                 print(line)
 
=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2020-12-10 17:32:42 +0000
+++ lib/cdimage/tests/test_tree.py	2021-02-16 11:34:00 +0000
@@ -2505,9 +2505,11 @@
         command_base = [
             "mktorrent", "-a", "https://torrent.ubuntu.com/announce",
             "--comment", "Ubuntu CD cdimage.ubuntu.com",
+            "--output",
         ]
         mock_check_call.assert_has_calls([
-            mock.call(command_base + [path], stdout=mock.ANY)
+            mock.call(command_base + ["%s.torrent" % path, path],
+                      stdout=mock.ANY)
             for path in paths])
 
     def test_publish_release_prefixes(self):
@@ -2570,6 +2572,7 @@
             mock.call([
                 "mktorrent", mock.ANY, mock.ANY,
                 "--comment", "Ubuntu CD cdimage.ubuntu.com",
+                "--output", "%s.iso.torrent" % target_base,
                 "%s.iso" % target_base,
             ], stdout=mock.ANY),
         ])
@@ -2621,6 +2624,7 @@
         mock_call.assert_called_once_with([
             "mktorrent", mock.ANY, mock.ANY,
             "--comment", "Ubuntu CD cdimage.ubuntu.com",
+            "--output", "%s.iso.torrent" % target_base,
             "%s.iso" % target_base,
         ], stdout=mock.ANY)
         self.assertCountEqual([
@@ -2796,9 +2800,11 @@
             "-a", "https://torrent.ubuntu.com/announce",
             "-a", "https://ipv6.torrent.ubuntu.com/announce",
             "--comment", "Ubuntu CD releases.ubuntu.com",
+            "--output",
         ]
         mock_check_call.assert_has_calls([
-            mock.call(command_base + [path], stdout=mock.ANY)
+            mock.call(command_base + ["%s.torrent" % path, path],
+                      stdout=mock.ANY)
             for path in paths])
 
     def test_publish_release_prefixes(self):
@@ -2876,7 +2882,8 @@
                 "-a", mock.ANY,
                 "-a", mock.ANY,
                 "--comment", "Ubuntu CD releases.ubuntu.com",
-                "%s.iso" % target_base,
+                "--output", "%s.iso.torrent" % target_base,
+                "%s.iso" % target_base
             ], stdout=mock.ANY),
         ])
         self.assertCountEqual([