diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index c039cea2d..084d1f884 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -25,7 +25,7 @@ jobs: - name: Check coding style run: | pip install flake8 isort - flake8 picard --count --show-source --statistics + flake8 picard test --count --show-source --statistics isort --check-only --diff --recursive picard test - name: Test with pytest if: always() diff --git a/test/formats/common.py b/test/formats/common.py index 626da2585..cfbe0c191 100644 --- a/test/formats/common.py +++ b/test/formats/common.py @@ -354,14 +354,14 @@ class CommonTests: for key in ( 'comment:foo', 'comment:de:foo', 'performer:foo', 'lyrics:foo', 'comment:a*', 'comment:a[', 'performer:(x)', 'performer: Ä é ' - ): + ): if not self.format.supports_tag(key): continue prefix = key.split(':')[0] metadata = Metadata() metadata[key] = 'bar' original_metadata = save_and_load_metadata(self.filename, metadata) - if not key in original_metadata and prefix in original_metadata: + if key not in original_metadata and prefix in original_metadata: continue # Skip if the type did not support saving this kind of tag self.assertEqual('bar', original_metadata[key], original_metadata) metadata[prefix] = '(foo) bar' @@ -373,7 +373,7 @@ class CommonTests: @skipUnlessTestfile def test_delete_nonexistant_tags(self): for key in ('title', 'foo', 'comment:foo', 'comment:de:foo', - 'performer:foo', 'lyrics:foo', 'totaltracks'): + 'performer:foo', 'lyrics:foo', 'totaltracks'): if not self.format.supports_tag(key): continue metadata = Metadata() @@ -514,7 +514,7 @@ class CommonTests: def test_save_movementnumber_without_movementtotal(self): if not self.format.supports_tag('movementnumber'): raise unittest.SkipTest('Tag "movementnumber" not supported for %s' % self.format.NAME) - metadata = Metadata({ 'movementnumber': 7 }) + metadata = Metadata({'movementnumber': 7}) loaded_metadata = save_and_load_metadata(self.filename, metadata) self.assertEqual(loaded_metadata['movementnumber'], metadata['movementnumber']) self.assertNotIn('movementtotal', loaded_metadata) diff --git a/test/formats/test_id3.py b/test/formats/test_id3.py index 8129152c4..f1349c430 100644 --- a/test/formats/test_id3.py +++ b/test/formats/test_id3.py @@ -311,7 +311,7 @@ class CommonId3Tests: ] for tag in tag_name_variants: - metadata = Metadata({ tag: 'foo' }) + metadata = Metadata({tag: 'foo'}) loaded_metadata = save_and_load_metadata(self.filename, metadata) self.assertEqual('foo', loaded_metadata['replaygain_album_gain']) diff --git a/test/formats/test_mp4.py b/test/formats/test_mp4.py index eaadcf188..60507b4ef 100644 --- a/test/formats/test_mp4.py +++ b/test/formats/test_mp4.py @@ -132,7 +132,7 @@ class CommonMP4Tests: @skipUnlessTestfile def test_invalid_int_tag(self): for tag in ['bpm', 'movementnumber', 'movementtotal', 'showmovement']: - metadata = Metadata({ tag: 'notanumber' }) + metadata = Metadata({tag: 'notanumber'}) loaded_metadata = save_and_load_metadata(self.filename, metadata) self.assertNotIn(tag, loaded_metadata) diff --git a/test/test_imagelist.py b/test/test_imagelist.py index 7750f4ff9..093616c2b 100644 --- a/test/test_imagelist.py +++ b/test/test_imagelist.py @@ -326,7 +326,7 @@ class ImageListTest(PicardTestCase): # settings is missing a setting del settings["save_images_to_tags"] with self.assertRaises(KeyError): - image = next(to_be_saved(settings)) + next(to_be_saved(settings)) def test_strip_front_images(self): self.imagelist.append(self.images['a']) diff --git a/test/test_script.py b/test/test_script.py index 785832608..405c80d52 100644 --- a/test/test_script.py +++ b/test/test_script.py @@ -1200,7 +1200,6 @@ class ScriptParserTest(PicardTestCase): datetime.datetime = _DateTime try: - context = Metadata() areg = r"^\d+:\d+:\$datetime: Unsupported format code" # Tests with invalid format code (platform dependent tests) for test_case in tests_to_run: @@ -1235,7 +1234,6 @@ class ScriptParserTest(PicardTestCase): datetime.datetime = _DateTime try: - context = Metadata() # Test that the correct position number is passed areg = r"^\d+:7:\$datetime: Unsupported format code" with self.assertRaisesRegex(ScriptRuntimeError, areg): diff --git a/test/test_settingsoverride.py b/test/test_settingsoverride.py index 1213b8ab9..1ece9510b 100644 --- a/test/test_settingsoverride.py +++ b/test/test_settingsoverride.py @@ -37,7 +37,7 @@ class SettingsOverrideTest(PicardTestCase): self.assertEqual(override['key1'], 'newval2') self.assertEqual(override['key2'], 'origval2') with self.assertRaises(KeyError): - x = override['key3'] + x = override['key3'] # noqa: F841 def test_read_orig_settings_kw(self): override = SettingsOverride(config.setting, key1='newval2') @@ -57,7 +57,7 @@ class SettingsOverrideTest(PicardTestCase): override['key3'] = 'newval5' self.assertEqual(override['key3'], 'newval5') with self.assertRaises(KeyError): - x = config.setting['key3'] + x = config.setting['key3'] # noqa: F841 def test_del_orig_settings(self): override = SettingsOverride(config.setting, self.new_settings) diff --git a/test/test_util_lrucache.py b/test/test_util_lrucache.py index eba5ddacf..bfb49de45 100644 --- a/test/test_util_lrucache.py +++ b/test/test_util_lrucache.py @@ -73,7 +73,7 @@ class LRUCacheTest(PicardTestCase): def test_get_keyerror(self): lrucache = LRUCache(3) with self.assertRaises(KeyError): - value = lrucache['notakey'] + value = lrucache['notakey'] # noqa: F841 def test_del_keyerror(self): lrucache = LRUCache(3)