Import tests use TestHelper

Removes duplicate code, increases speed and makes some files clake8 clean.

Author: Thomas Scholtes

setup.cfg

@@ -3,9 +3,10 @@ verbosity=1
 logging-clear-handlers=1
 
 [flake8]
-# E231  missing whitespace after ',' (used to align visually)
-ignore=E241
+# E241  missing whitespace after ',' (used to align visually)
+# E221  multiple spaces before operator (used to align visually)
+ignore=E241,E221
 
 # List of files that have not been cleand up yet. We will try to reduce
 # this with each commit
-exclude=test/*
+exclude=test/test_config_command.py,test/test_files.py,test/test_art.py,test/test_dbcore.py,test/test_web.py,test/test_zero.py,test/rsrc/beetsplug/test.py,test/test_template.py,test/test_importfeeds.py,test/test_echonest.py,test/test_datequery.py,test/test_mb.py,test/test_convert.py,test/testall.py,test/test_player.py,test/test_query.py,test/test_mediafile.py,test/test_keyfinder.py,test/test_the.py,test/test_library.py,test/test_lyrics.py,test/test_ihate.py,test/test_vfs.py,test/test_replaygain.py,test/__init__.py,test/_common.py,test/test_mediafile_edge.py,test/test_ui.py,test/helper.py,test/test_autotag.py,test/test_pipeline.py

test/helper.py

@@ -25,9 +25,9 @@
 from beets import config
 import beets.plugins
 from beets.library import Library, Item
+from beets import importer
 
-# TODO Move this here, along with AutotagMock
-from test_importer import TestImportSession
+# TODO Move AutotagMock here
 import _common
 
 
@@ -120,6 +120,7 @@ def setup_beets(self, disk=False):
         self.lib = Library(dbpath, self.libdir)
 
     def teardown_beets(self):
+        self.lib._connection().close()
         del os.environ['BEETSDIR']
         # FIXME somehow close all open fd to the ilbrary
         self.remove_temp_dir()
@@ -219,3 +220,46 @@ def remove_temp_dir(self):
         """Delete the temporary directory created by `create_temp_dir`.
         """
         shutil.rmtree(self.temp_dir)
+
+
+class TestImportSession(importer.ImportSession):
+    """ImportSession that can be controlled programaticaly.
+
+    >>> lib = Library(':memory:')
+    >>> importer = TestImportSession(lib, paths=['/path/to/import'])
+    >>> importer.add_choice(importer.action.SKIP)
+    >>> importer.add_choice(importer.action.ASIS)
+    >>> importer.default_choice = importer.action.APPLY
+    >>> importer.run()
+
+    This imports ``/path/to/import`` into `lib`. It skips the first
+    album and imports thesecond one with metadata from the tags. For the
+    remaining albums, the metadata from the autotagger will be applied.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(TestImportSession, self).__init__(*args, **kwargs)
+        self._choices = []
+
+    default_choice = importer.action.APPLY
+
+    def add_choice(self, choice):
+        self._choices.append(choice)
+
+    def clear_choices(self):
+        self._choices = []
+
+    def choose_match(self, task):
+        try:
+            choice = self._choices.pop(0)
+        except IndexError:
+            choice = self.default_choice
+
+        if choice == importer.action.APPLY:
+            return task.candidates[0]
+        elif isinstance(choice, int):
+            return task.candidates[choice-1]
+        else:
+            return choice
+
+    choose_item = choose_match