Merge branch 'master' of github.com:beetbox/beets into deinterlace

docs/changelog.rst

@@ -10,6 +10,12 @@ This release now requires Python 3.6 or later (it removes support for Python
 * A new :doc:`/plugins/fetchart` option to store cover art as non-progressive
   image. Useful for DAPs that support progressive images. Set ``deinterlace:
   yes`` in your configuration to enable.
+For packagers:
+
+* We fixed a flaky test, named `test_album_art` in the `test_zero.py` file,
+  that some distributions had disabled. Disabling this test should no longer
+  be necessary.
+  :bug:`4037` :bug:`4038`
 
 
 1.5.0 (August 19, 2021)

test/test_ui.py

@@ -770,6 +770,7 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions):
         os.makedirs(self.beetsdir)
 
         self._reset_config()
+        self.load_plugins()
 
     def tearDown(self):
         commands.default_commands.pop()
@@ -780,6 +781,7 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions):
             del os.environ['APPDATA']
         else:
             os.environ['APPDATA'] = self._old_appdata
+        self.unload_plugins()
         self.teardown_beets()
 
     def _make_test_cmd(self):