Ressurect xdist with try/except block

snoopycrimecop · Jan 23, 2020 · 11f81d5 · 11f81d5
1 parent 6f84881
commit 11f81d5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/components/tools/OmeroPy/test/conftest.py b/components/tools/OmeroPy/test/conftest.py
@@ -95,4 +95,15 @@ def pytest_configure(config):
         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"
diff --git a/components/tools/OmeroWeb/test/conftest.py b/components/tools/OmeroWeb/test/conftest.py
@@ -12,3 +12,14 @@ def pytest_configure(config):
     if not hasattr(config, 'slaveinput'):
         workerid = 'main'
         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