From 030deb4b25cda842ff7129ab7c18550c44dd8379 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Sat, 5 Jun 2021 16:01:34 -0700
Subject: [PATCH] Try to handle intermittent FileNotFoundError in tests

Refs #1361
---
 tests/conftest.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index ad3eb9f1..c6a3eee6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -61,13 +61,18 @@ def move_to_front(items, test_name):
 
 @pytest.fixture
 def restore_working_directory(tmpdir, request):
-    previous_cwd = os.getcwd()
+    try:
+        previous_cwd = os.getcwd()
+    except OSError:
+        # https://github.com/simonw/datasette/issues/1361
+        previous_cwd = None
     tmpdir.chdir()
 
     def return_to_previous():
         os.chdir(previous_cwd)
 
-    request.addfinalizer(return_to_previous)
+    if previous_cwd is not None:
+        request.addfinalizer(return_to_previous)
 
 
 @pytest.fixture(scope="session", autouse=True)