Allow running tests without the presence of a fixtures module

colibris-framework · Jul 30, 2019 · ecb6817 · ecb6817 · lucifurtun · Jul 30, 2019
1 parent bdf73e0
commit ecb6817
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/colibris/commands/test.py b/colibris/commands/test.py
@@ -3,6 +3,7 @@
 import os
 
 from colibris.conf import settings
+from colibris.utils import import_module_or_none
 
 from .base import BaseCommand
 
@@ -56,7 +57,10 @@ def execute(self, options):
             os.chdir(tests_dir)
 
         plugins = list(_PLUGINS)
+
         # Use project's fixtures as a plugin so that project-specific fixtures are loaded
-        plugins.append('{}.tests.fixtures'.format(settings.PROJECT_PACKAGE_NAME))
+        fixtures_path = '{}.tests.fixtures'.format(settings.PROJECT_PACKAGE_NAME)
+        if import_module_or_none(fixtures_path):
+            plugins.append(fixtures_path)
 
         return pytest.main(args, plugins=plugins)
diff --git a/colibris/utils.py b/colibris/utils.py
@@ -25,6 +25,7 @@ def import_member(path):
 
 
 def import_module_or_none(path):
+    # TODO py36 remove this workaround
     # In Python < 3.6 we don't have ModuleNotFoundError
     ModuleNotFoundError = getattr(builtins, 'ModuleNotFoundError', ImportError)