Reorganize test packages and remove custom runners

* Custom runners are unneeded with the builtin "unittest discovery"
  command.

* Reorganize test packages and avoid conflicts with the builtin
  `unittest` module.

* Remove unneeded path and suite boilerplate from tests.

Author: edudobay

Makefile

@@ -4,22 +4,24 @@ PATH := $(project_dir)/venv/bin:$(PATH)
 all:
 
 format:
-	python -m black mingus mingus_examples unittest
+	python -m black mingus mingus_examples tests
 
 dev:
 	pip install -e '.[fft,fluidsynth]' -r requirements-dev.in
 
 install:
 	pip install .
 
-test:
-	(cd unittest; python run_tests.py)
+test: test-unit
+
+test-unit:
+	python -m unittest discover tests.unit
 
 test-fluidsynth:
-	(cd unittest; python run_fluidsynth_tests.py)
+	python -m unittest tests.integration.test_fluidsynth
 
 test-lilypond:
-	(cd unittest; python run_lilypond_tests.py)
+	python -m unittest tests.integration.test_lilypond
 
 test-all: test test-fluidsynth test-lilypond
 
@@ -47,6 +49,6 @@ release: clean build sign-build upload tag
 
 .PHONY: format \
 	dev install \
-	test test-fluidsynth test-lilypond test-all \
+	test test-unit test-fluidsynth test-lilypond test-all \
 	clean build \
 	upload tag release

tests/__init__.py

@@ -20,6 +20,9 @@ class test_fluidsynth(unittest.TestCase):
 
     Check the :py:mod:`mingus.midi.fluidsynth` module for tips on finding
     SoundFonts.
+
+    Remember: you need a running fluidsynth server process listening at port
+    9800 to pass this test.
     """
 
     def setUp(self):
@@ -191,7 +194,3 @@ def test_composition(self):
         c + t
         c + t2
         self.assertTrue(fluidsynth.play_Composition(c))
-
-
-def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(test_fluidsynth)

unittest/example.sf2 tests/example.sf2unittest/example.sf2 renamed to tests/example.sf2

@@ -189,7 +189,3 @@ def test_to_png(self):
         )
         self.assertTrue(LilyPond.to_png(LilyPond.from_Bar(self.tbar), "pn2"))
         self.assertTrue(LilyPond.to_png(LilyPond.from_Bar(self.mbar), "pn3"))
-
-
-def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(test_LilyPond)

tests/integration/__init__.py

@@ -1,15 +1,12 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-# -*- coding: utf-8 -*-
-import sys
+import unittest
 
-sys.path += ["../"]
-from mingus.core.keys import Key
 from mingus.containers.bar import Bar
 from mingus.containers.note import Note
 from mingus.containers.note_container import NoteContainer
-from mingus.containers.mt_exceptions import MeterFormatError
-import unittest
+from mingus.core.keys import Key
 
 
 class test_Bar(unittest.TestCase):
@@ -121,7 +118,3 @@ def test_determine_progression(self):
         b + ["C", "E", "G"]
         b + ["F", "A", "C"]
         self.assertEqual([[0.0, ["I"]], [0.25, ["IV"]]], b.determine_progression(True))
-
-
-def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(test_Bar)

unittest/test_fluidsynth.py tests/integration/test_fluidsynth.pyunittest/test_fluidsynth.py renamed to tests/integration/test_fluidsynth.py

@@ -1,17 +1,12 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
-# -*- coding: utf-8 -*-
-import sys
+import unittest
 
-sys.path += ["../"]
+# noinspection PyUnresolvedReferences
 from mingus.containers.composition import Composition
-import unittest
 
 
 class test_Composition(unittest.TestCase):
     def setUp(self):
         pass
-
-
-def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(test_Composition)