verify file existence in get_path()

Author: dlqqq

jupyter_server/pytest_plugin.py

@@ -477,7 +477,12 @@ def delete_fid_db(fid_db_path):
 @pytest.fixture
 def fid_manager(fid_db_path, tmp_path):
     """Fixture returning a test-configured instance of `FileIdManager`."""
-    return FileIdManager(db_path=fid_db_path, root_dir=str(tmp_path))
+    fid_manager = FileIdManager(db_path=fid_db_path, root_dir=str(tmp_path))
+    # disable journal so no temp journal file is created under `tmp_path`.
+    # reduces test flakiness since sometimes journal file has same ino and
+    # crtime as a deleted file, so FID manager detects it wrongly as a move
+    fid_manager.con.execute("PRAGMA journal_mode = OFF")
+    return fid_manager
 
 
 @pytest.fixture

jupyter_server/services/contents/fileidmanager.py

@@ -298,7 +298,13 @@ def get_path(self, id):
         self._sync_all()
         self.con.commit()
         row = self.con.execute("SELECT path FROM Files WHERE id = ?", (id,)).fetchone()
-        return row[0] if row else None
+        path = row and row[0]
+
+        # if no record associated with ID or if file no longer exists at path, return None
+        if path is None or self._stat(path) is None:
+            return None
+
+        return path
 
     def move(self, old_path, new_path, recursive=False):
         """Handles file moves by updating the file path of the associated file

tests/services/contents/test_fileidmanager.py

@@ -68,17 +68,20 @@ def test_index_already_indexed(fid_manager, test_path):
     assert id == fid_manager.index(test_path)
 
 
+# test out-of-band move detection for FIM.index()
+def test_index_oob_move(fid_manager, old_path, new_path):
+    id = fid_manager.index(old_path)
+    os.rename(old_path, new_path)
+    assert fid_manager.index(new_path) == id
+
+
 def test_getters_indexed(fid_manager, test_path):
     id = fid_manager.index(test_path)
 
     assert fid_manager.get_id(test_path) == id
     assert fid_manager.get_path(id) == test_path
 
 
-def test_get_id_unindexed(fid_manager, test_path_child):
-    assert fid_manager.get_id(test_path_child) == None
-
-
 def test_getters_nonnormalized(fid_manager, test_path):
     path1 = os.path.join(test_path, "file")
     path2 = os.path.join(test_path, "some_dir", "..", "file")
@@ -92,11 +95,17 @@ def test_getters_nonnormalized(fid_manager, test_path):
     assert fid_manager.get_id(path3) == id
 
 
-# test out-of-band move detection for FIM.index()
-def test_index_oob_move(fid_manager, old_path, new_path):
-    id = fid_manager.index(old_path)
-    os.rename(old_path, new_path)
-    assert fid_manager.index(new_path) == id
+def test_getters_oob_delete(fid_manager, test_path):
+    id = fid_manager.index(test_path)
+    os.rmdir(test_path)
+    print(fid_manager.con.execute("select * from Files").fetchall())
+    assert id is not None
+    assert fid_manager.get_id(test_path) == None
+    assert fid_manager.get_path(id) == None
+
+
+def test_get_id_unindexed(fid_manager, test_path_child):
+    assert fid_manager.get_id(test_path_child) == None
 
 
 # test out-of-band move detection for FIM.get_id()