Merge pull request #198 from chingc/main

Fix #130: Test Results directory in setup fails intermittently
ElSnoMan · Jun 5, 2021 · 6e9c099 · 6e9c099
2 parents a924edb + d320a29
commit 6e9c099
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/conftest.py b/conftest.py
@@ -92,11 +92,19 @@ def test_run(project_root, request) -> str:
         # delete /test_results from previous Test Run
         shutil.rmtree(test_results_dir, ignore_errors=True)
 
-    Path(test_results_dir).mkdir(parents=True, exist_ok=True)
+    try:
+        # race condition can occur between checking file existence and
+        # creating the file when using pytest with multiple workers
+        Path(test_results_dir).mkdir(parents=True, exist_ok=True)
+    except FileExistsError:
+        pass
 
     for test in session.items:
-        # make the test_result directory for each test
-        Path(f'{test_results_dir}/{test.name}').mkdir(parents=True, exist_ok=True)
+        try:
+            # make the test_result directory for each test
+            Path(f'{test_results_dir}/{test.name}').mkdir(parents=True, exist_ok=True)
+        except FileExistsError:
+            pass
 
     return test_results_dir
 

diff --git a/pylenium/scripts/conftest.py b/pylenium/scripts/conftest.py
@@ -92,11 +92,19 @@ def test_run(project_root, request) -> str:
         # delete /test_results from previous Test Run
         shutil.rmtree(test_results_dir, ignore_errors=True)
 
-    Path(test_results_dir).mkdir(parents=True, exist_ok=True)
+    try:
+        # race condition can occur between checking file existence and
+        # creating the file when using pytest with multiple workers
+        Path(test_results_dir).mkdir(parents=True, exist_ok=True)
+    except FileExistsError:
+        pass
 
     for test in session.items:
-        # make the test_result directory for each test
-        Path(f'{test_results_dir}/{test.name}').mkdir(parents=True, exist_ok=True)
+        try:
+            # make the test_result directory for each test
+            Path(f'{test_results_dir}/{test.name}').mkdir(parents=True, exist_ok=True)
+        except FileExistsError:
+            pass
 
     return test_results_dir