Merge lp:~jelmer/brz-debian/teyit into lp:brz-debian

[Jelmer Vernooij]

Improve unittest calls

Improve unittest calls

reformatted tests/test_upstream_uscan.py
reformatted tests/test_merge_package.py
reformatted tests/test_import_dsc.py
All done! 3 reformatted, 27 left unchanged

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Project setup failed
https://ci.breezy-vcs.org/job/brz-debian/job/brz-debian-land/5725/

Unmerged revisions

1597. By Jelmer Vernooij on 2023-02-01

Improve unittest calls

reformatted tests/test_upstream_uscan.py
reformatted tests/test_merge_package.py
reformatted tests/test_import_dsc.py
All done! 3 reformatted, 27 left unchanged

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2023-01-22 22:56:44 +0000
+++ tests/test_import_dsc.py	2023-02-01 18:16:03 +0000
@@ -925,7 +925,7 @@
         self.assertEqual(
             rev.message,
             "Import upstream version %s" % str(version2.upstream_version))
-        self.assertIs(rev.properties.get('deb-md5'), None)
+        self.assertIsNone(rev.properties.get('deb-md5'))
         rev_tree1 = branch.repository.revision_tree(rev.parent_ids[0])
         rev_tree2 = branch.repository.revision_tree(rev_id)
         changes = rev_tree2.changes_from(rev_tree1)
@@ -963,7 +963,7 @@
             rev.message,
             "Import upstream version %s" % str(version.upstream_version))
         self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
-        self.assertTrue('deb-pristine-delta' in rev.properties)
+        self.assertIn('deb-pristine-delta', rev.properties)
 
     def test_import_upstream_with_bzip2_tarball(self):
         self.requireFeature(PristineTarFeature)
@@ -995,7 +995,7 @@
             rev.message,
             "Import upstream version %s" % str(version.upstream_version))
         self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
-        self.assertTrue('deb-pristine-delta-bz2' in rev.properties)
+        self.assertIn('deb-pristine-delta-bz2', rev.properties)
 
     def test_import_upstream_with_lzma_tarball(self):
         self.requireFeature(PristineTarFeature)
@@ -1045,7 +1045,7 @@
             rev.message,
             "Import upstream version %s" % str(version.upstream_version))
         self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
-        self.assertTrue('deb-pristine-delta-xz' in rev.properties)
+        self.assertIn('deb-pristine-delta-xz', rev.properties)
 
     def test_import_package_init_from_other(self):
         self.requireFeature(PristineTarFeature)

=== modified file 'tests/test_merge_package.py'
--- tests/test_merge_package.py	2023-01-12 11:16:09 +0000
+++ tests/test_merge_package.py	2023-02-01 18:16:03 +0000
@@ -181,11 +181,11 @@
         merged_parent = ubup.get_parent_ids()[1]
         its_parents_map = ubup.branch.repository.get_parent_map([
                 merged_parent])
-        self.assertTrue(merged_parent in its_parents_map)
+        self.assertIn(merged_parent, its_parents_map)
         its_parents = its_parents_map[merged_parent]
         their_parents = ubup.branch.repository.get_parent_map(its_parents)
-        self.assertTrue(its_parents[0] in their_parents)
-        self.assertTrue(its_parents[1] in their_parents)
+        self.assertIn(its_parents[0], their_parents)
+        self.assertIn(its_parents[1], their_parents)
 
     def test_debian_upstream_older(self):
         """Diverging upstreams (debian older) don't cause merge conflicts.

=== modified file 'tests/test_upstream_uscan.py'
--- tests/test_upstream_uscan.py	2023-01-12 11:16:09 +0000
+++ tests/test_upstream_uscan.py	2023-02-01 18:16:03 +0000
@@ -49,14 +49,14 @@
         self.build_tree(['watch'])
         self.tree.add(['watch'])
         with tempfile.TemporaryDirectory() as tmpdir:
-            self.assertIsNot(src._export_file('watch', tmpdir), None)
+            self.assertIsNotNone(src._export_file('watch', tmpdir))
 
     def test_export_watchfile(self):
         src = UScanSource(self.tree, '', False)
         self.build_tree(['debian/', 'debian/watch'])
         self.tree.smart_add(['debian/watch'])
         with tempfile.TemporaryDirectory() as tmpdir:
-            self.assertIsNot(src._export_file('watch', tmpdir), None)
+            self.assertIsNotNone(src._export_file('watch', tmpdir))
 
 
 class UScanOutputParsingTests(TestCase):