fmu-settings 0.5.2__tar.gz → 0.5.3__tar.gz

{fmu_settings-0.5.2 → fmu_settings-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu-settings
-Version: 0.5.2
+Version: 0.5.3
 Summary: A library for managing FMU settings
 Author-email: Equinor <fg-fmu_atlas@equinor.com>
 License: GPL-3.0

{fmu_settings-0.5.2 → fmu_settings-0.5.3}/src/fmu/settings/_resources/lock_manager.py

@@ -32,6 +32,10 @@ class LockError(Exception):
     """Raised when the lock cannot be acquired."""
 
 
+class LockNotFoundError(FileNotFoundError):
+    """Raised when the lock cannot be found."""
+
+
 class LockManager(PydanticResourceManager[LockInfo]):
     """Manages the .lock file."""
 
@@ -196,7 +200,7 @@ class LockManager(PydanticResourceManager[LockInfo]):
         if not self.exists:
             if self.is_acquired():
                 self.release()
-            raise LockError("Cannot refresh: lock file does not exist")
+            raise LockNotFoundError("Cannot refresh: lock file does not exist")
 
         lock_info = self._safe_load()
         if not lock_info or not self._is_mine(lock_info):

{fmu_settings-0.5.2 → fmu_settings-0.5.3}/src/fmu/settings/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.5.2'
-__version_tuple__ = version_tuple = (0, 5, 2)
+__version__ = version = '0.5.3'
+__version_tuple__ = version_tuple = (0, 5, 3)
 
-__commit_id__ = commit_id = 'g4490dbb9d'
+__commit_id__ = commit_id = 'g7953e1c0f'

{fmu_settings-0.5.2 → fmu_settings-0.5.3}/src/fmu_settings.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu-settings
-Version: 0.5.2
+Version: 0.5.3
 Summary: A library for managing FMU settings
 Author-email: Equinor <fg-fmu_atlas@equinor.com>
 License: GPL-3.0

{fmu_settings-0.5.2 → fmu_settings-0.5.3}/tests/test_resources/test_lock_manager.py

@@ -19,6 +19,7 @@ from fmu.settings._resources.lock_manager import (
     DEFAULT_LOCK_TIMEOUT,
     LockError,
     LockManager,
+    LockNotFoundError,
 )
 from fmu.settings.models.lock_info import LockInfo
 
@@ -493,15 +494,21 @@ def test_refresh_works_as_expected(
 def test_refresh_without_lock_file(
     fmu_dir: ProjectFMUDirectory, monkeypatch: MonkeyPatch
 ) -> None:
-    """Tests refresh when lock file is not present."""
-    lock = LockManager(fmu_dir)
-    with pytest.raises(LockError, match="does not exist"):
-        lock.refresh()
+    """Tests that if a user deletes anothers lock it's invalidated on a refresh."""
+    with pytest.raises(LockNotFoundError, match="does not exist"):
+        fmu_dir._lock.refresh()
 
-    lock.acquire()
-    lock.path.unlink()  # It was deleted or something.
-    with pytest.raises(LockError, match="does not exist"):
-        lock.refresh()
+    fmu_dir._lock.acquire()
+    assert fmu_dir._lock.is_acquired() is True
+
+    # Someone deletes the lock
+    fmu_dir._lock.path.unlink()
+
+    with pytest.raises(
+        LockNotFoundError, match="Cannot refresh: lock file does not exist"
+    ):
+        fmu_dir._lock.refresh()
+    assert fmu_dir._lock.is_acquired() is False
 
 
 def test_refresh_without_owning_lock(
@@ -649,18 +656,3 @@ def test_ensure_can_write_foreign_lock(fmu_dir: ProjectFMUDirectory) -> None:
         pytest.raises(PermissionError, match="Cannot write to .fmu directory"),
     ):
         lock.ensure_can_write()
-
-
-def test_manual_delete_invalidates_lock_file_on_refresh(
-    fmu_dir: ProjectFMUDirectory,
-) -> None:
-    """Tests that if a user deletes anothers lock it's invalidated on a refresh."""
-    fmu_dir._lock.acquire()
-    assert fmu_dir._lock.is_acquired() is True
-
-    # Someone deletes the lock
-    fmu_dir._lock.path.unlink()
-
-    with pytest.raises(LockError, match="Cannot refresh: lock file does not exist"):
-        fmu_dir._lock.refresh()
-    assert fmu_dir._lock.is_acquired() is False