Incorporate _common.Assertions into helper.TestHelper

beets/test/helper.py

@@ -142,7 +142,7 @@ def has_program(cmd, args=["--version"]):
         return True
 
 
-class TestHelper:
+class TestHelper(_common.Assertions):
     """Helper mixin for high-level cli and plugin tests.
 
     This mixin provides methods to isolate beets' global state provide

test/test_importer.py

@@ -271,7 +271,7 @@ def create_archive(session):
     return path
 
 
-class RmTempTest(unittest.TestCase, ImportHelper, _common.Assertions):
+class RmTempTest(unittest.TestCase, ImportHelper):
     """Tests that temporarily extracted archives are properly removed
     after usage.
     """
@@ -1170,9 +1170,7 @@ def match_album_mock(*args, **kwargs):
 
 
 @patch("beets.autotag.mb.match_album", Mock(side_effect=match_album_mock))
-class ImportDuplicateAlbumTest(
+class ImportDuplicateAlbumTest(unittest.TestCase, TestHelper):
-    unittest.TestCase, TestHelper, _common.Assertions
-):
     def setUp(self):
         self.setup_beets()
 
@@ -1294,9 +1292,7 @@ def match_track_mock(*args, **kwargs):
 
 
 @patch("beets.autotag.mb.match_track", Mock(side_effect=match_track_mock))
-class ImportDuplicateSingletonTest(
+class ImportDuplicateSingletonTest(unittest.TestCase, TestHelper):
-    unittest.TestCase, TestHelper, _common.Assertions
-):
     def setUp(self):
         self.setup_beets()
 
@@ -1650,7 +1646,7 @@ class MultiDiscAlbumsInDirTest(_common.TestCase):
         self.assertEqual(len(items), 3)
 
 
-class ReimportTest(unittest.TestCase, ImportHelper, _common.Assertions):
+class ReimportTest(unittest.TestCase, ImportHelper):
     """Test "re-imports", in which the autotagging machinery is used for
     music that's already in the library.
 

test/test_ui.py

@@ -844,7 +844,7 @@ class ImportTest(_common.TestCase):
 
 
 @_common.slow_test()
-class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions):
+class ConfigTest(unittest.TestCase, TestHelper):
     def setUp(self):
         self.setup_beets()