Merge pull request ome#6204 from will-moore/web_test_DJANGO_SETTINGS_…

…MODULE

Fix DJANGO_SETTINGS_MODULE not defined

components/tools/OmeroPy/test/conftest.py

@@ -95,10 +95,15 @@ def pytest_configure(config):
         os.environ["OMERO_USERDIR"] = workdir(workerid)
 
 
-def pytest_configure_node(node):
-    if hasattr(node, 'slaveinput'):
-        workerid = node.slaveinput["workerid"]
-        os.environ["OMERO_USERDIR"] = workdir(workerid)
+try:
+    import xdist  # noqa
+
+    def pytest_configure_node(node):
+        if hasattr(node, 'slaveinput'):
+            workerid = node.slaveinput["workerid"]
+            os.environ["OMERO_USERDIR"] = workdir(workerid)
+except ImportError:
+    pass
 
 
 pytest_plugins = "omero.gateway.pytest_fixtures"

components/tools/OmeroWeb/setup.py

@@ -13,13 +13,6 @@
 from setuptools import setup
 from omero_version import omero_version as ov
 
-if "test" in sys.argv:
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "omeroweb.settings")
-
-    import django
-    if django.VERSION > (1, 7):
-        django.setup()
-
 
 setup(name="OmeroWeb",
       version=ov,
@@ -33,5 +26,5 @@
       download_url="https://github.com/openmicroscopy/openmicroscopy/",
       packages=[''],
       test_suite='test.suite',
-      tests_require=['pytest', 'pytest-xdist'],
+      tests_require=['pytest', 'pytest-xdist', 'pytest-django'],
       )

components/tools/OmeroWeb/test/conftest.py

@@ -14,7 +14,12 @@ def pytest_configure(config):
         os.environ["OMERO_USERDIR"] = workdir(workerid)
 
 
-def pytest_configure_node(node):
-    if hasattr(node, 'slaveinput'):
-        workerid = node.slaveinput["workerid"]
-        os.environ["OMERO_USERDIR"] = workdir(workerid)
+try:
+    import xdist  # noqa
+
+    def pytest_configure_node(node):
+        if hasattr(node, 'slaveinput'):
+            workerid = node.slaveinput["workerid"]
+            os.environ["OMERO_USERDIR"] = workdir(workerid)
+except ImportError:
+    pass

components/tools/pytest.ini

@@ -1,4 +1,6 @@
 [pytest]
+# pip install pytest-django
+DJANGO_SETTINGS_MODULE = omeroweb.settings
 markers =
     broken: mark the test as broken, i.e. it may be intermittent or failing without a fully understood cause
     fs_suite: group together FS tests