More robust unit tests

Author: fcollonval

jupyter_server/services/contents/filemanager.py

@@ -493,7 +493,11 @@ def is_non_empty_dir(os_path):
             return False
 
         if self.delete_to_trash:
-            if not self.always_delete_dir and sys.platform == 'win32' and is_non_empty_dir(os_path):
+            if (
+                not self.always_delete_dir
+                and sys.platform == "win32"
+                and is_non_empty_dir(os_path)
+            ):
                 # send2trash can really delete files on Windows, so disallow
                 # deleting non-empty files. See Github issue 3631.
                 raise web.HTTPError(400, u'Directory %s not empty' % os_path)

jupyter_server/tests/services/contents/test_manager.py

@@ -510,14 +510,20 @@ async def test_delete(jp_contents_manager):
         await ensure_async(cm.get(path))
 
 
-@pytest.mark.parametrize("delete_to_trash, always_delete, error", (
-    [True, True, False],
-    # on linux test folder won't be on home folder => _check_trash will be False
-    [True, False, True if sys.platform in {"win32", "linux"} else False],
-    [False, True, False],
-    [False, False, True],
-))
-async def test_delete_non_empty_folder(delete_to_trash, always_delete, error, jp_contents_manager):
+@pytest.mark.parametrize(
+    "delete_to_trash, always_delete, error",
+    (
+        [True, True, False],
+        # on linux test folder may not be on home folder drive
+        # => if this is the case, _check_trash will be False
+        [True, False, None],
+        [False, True, False],
+        [False, False, True],
+    ),
+)
+async def test_delete_non_empty_folder(
+    delete_to_trash, always_delete, error, jp_contents_manager
+):
     cm = jp_contents_manager
     cm.delete_to_trash = delete_to_trash
     cm.always_delete_dir = always_delete
@@ -527,8 +533,20 @@ async def test_delete_non_empty_folder(delete_to_trash, always_delete, error, jp
     await make_populated_dir(cm, dir)
     await check_populated_dir_files(cm, dir)
 
+    if error is None:
+        error = False
+        if sys.platform == "win32":
+            error = True
+        elif sys.platform == "linux":
+            file_dev = os.stat(cm.root_dir).st_dev
+            home_dev = os.stat(os.path.expanduser("~")).st_dev
+            error = file_dev != home_dev
+
     if error:
-        with pytest.raises(HTTPError, match=r"HTTP 400: Bad Request \(Directory .*?to_delete not empty\)"):
+        with pytest.raises(
+            HTTPError,
+            match=r"HTTP 400: Bad Request \(Directory .*?to_delete not empty\)",
+        ):
             await ensure_async(cm.delete_file(dir))
     else:
         await ensure_async(cm.delete_file(dir))