[test] Moved tests to their own directory

patacrep/files.py

@@ -71,6 +71,21 @@ def chdir(path):
     else:
         yield
 
+def iter_modules(path, prefix):
+    """Iterate over modules located in list of `path`.
+
+    Prefix is a prefix appended to all module names.
+    """
+    for module_finder, name, __is_pkg in pkgutil.walk_packages(path, prefix):
+        if name in sys.modules:
+            yield sys.modules[name]
+        else:
+            try:
+                yield module_finder.find_spec(name).loader.load_module()
+            except ImportError as error:
+                LOGGER.debug("[plugins] Could not load module {}: {}".format(name, str(error)))
+                continue
+
 def load_plugins(datadirs, root_modules, keyword):
     """Load all plugins, and return a dictionary of those plugins.
 
@@ -101,18 +116,10 @@ def load_plugins(datadirs, root_modules, keyword):
         for path
         in sys.path
         ]
-    for module_finder, name, __is_pkg in pkgutil.walk_packages(
+    for module in iter_modules(
             datadir_path + sys_path,
             prefix="patacrep.{}.".format(".".join(root_modules))
         ):
-        if name in sys.modules:
-            module = sys.modules[name]
-        else:
-            try:
-                module = module_finder.find_spec(name).loader.load_module()
-            except ImportError as error:
-                LOGGER.debug("[plugins] Could not load module {}: {}".format(name, str(error)))
-                continue
         if hasattr(module, keyword):
             for (key, value) in getattr(module, keyword).items():
                 if key in plugins:

patacrep/songs/chordpro/test/__init__.py

@@ -1 +0,0 @@
-"""Test for chordpro parser"""

setup.py

@@ -15,7 +15,7 @@ setup(
     author='The Songbook team',
     author_email='crep@team-on-fire.com',
     url='https://github.com/patacrep/patacrep',
-    packages=find_packages(),
+    packages=find_packages(exclude=["test*"]),
     license="GPLv2 or any later version",
     install_requires=[
         "unidecode", "jinja2", "chardet", "ply",
@@ -39,6 +39,6 @@ setup(
         "Topic :: Utilities",
         ],
     platforms=["GNU/Linux", "Windows", "MacOsX"],
-    test_suite="patacrep.test.suite",
+    test_suite="test.suite",
     long_description = open("README.rst", "r").read(),
 )

patacrep/test.py → test/__init__.py

@@ -16,20 +16,14 @@ def disable_logging():
     logging.disable(logging.NOTSET)
 
 def suite():
-    """Return a TestSuite object, to test whole `patacrep` package.
-
-    Both unittest and doctest are tested.
+    """Return a :class:`TestSuite` object, testing all module :mod:`patacrep`.
     """
     test_loader = unittest.defaultTestLoader
-    return test_loader.discover(os.path.dirname(__file__))
-
-def load_tests(__loader, tests, __pattern):
-    """Load tests (unittests and doctests)."""
-    # Loading doctests
-    tests.addTests(doctest.DocTestSuite(patacrep))
-
-    # Unittests are loaded by default
-    return tests
+    return test_loader.discover(
+        os.path.abspath(os.path.dirname(__file__)),
+        pattern="*.py",
+        top_level_dir=os.path.abspath(os.path.join(patacrep.__path__[0], "..")),
+        )
 
 if __name__ == "__main__":
     unittest.TextTestRunner().run(suite())

patacrep/songs/chordpro/test/test_parser.py → test/test_chordpro/test_parser.py

@@ -8,7 +8,8 @@ import unittest
 
 from patacrep.build import DEFAULT_CONFIG
 from patacrep.songs.chordpro import ChordproSong
-from patacrep.test import disable_logging
+
+from .. import disable_logging
 
 LANGUAGES = {
     'tex': 'latex',

test/test_doctest.py

@@ -0,0 +1,37 @@
+#!/usr/bin python
+
+# Copyright 2015 Louis Paternault
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests"""
+
+import doctest
+
+import patacrep
+from patacrep import files
+
+def load_tests(__loader, tests, __pattern):
+    """Load tests (doctests).
+    """
+    # Loading doctests
+    tests.addTests(doctest.DocTestSuite(patacrep))
+    for module in files.iter_modules(patacrep.__path__, "{}.".format(patacrep.__name__)):
+        try:
+            tests.addTests(doctest.DocTestSuite(module))
+        except ValueError:
+            # No docstring, or no doctests in the docstrings
+            continue
+
+    return tests

tox.ini

@@ -12,4 +12,4 @@ deps =
 [testenv:lint]
 basepython=python3.4
 deps=pylint
-commands=pylint patacrep --rcfile=pylintrc
+commands=pylint patacrep test --rcfile=pylintrc