Merge pull request #509 from aclist/fix/marks-on-fixtures

fix: do not apply marks to fixtures

dzgui/model/servers.py

@@ -201,43 +201,19 @@ class ServerModelManager:
 
     @call_on_thread(dialog.querying)
     def add_by_ip(self, addr: str) -> None:
-        self.preserve_on_fail = True
-        try:
         res = Servers.query_by_ip(addr)
         self._parse_single_record(res)
-        except Exception as e:
-            logger.warning(e)
-            self.thread_man.set_cleanup_func(
-                StoredFunc(self._cleanup_on_failure), destroy_first=True
-            )
-            return
 
     @call_on_thread(dialog.querying)
     def add_by_record(self, record: Servers.Record) -> None:
-        self.preserve_on_fail = True
         # NOTE: rationale: a raw Record as shown in server browser may resolve to a different IP
-        try:
         res = Servers.query_by_record(record)
         self._parse_single_record(res)
-        except Exception as e:
-            logger.warning(e)
-            self.thread_man.set_cleanup_func(
-                StoredFunc(self._cleanup_on_failure), destroy_first=True
-            )
-            return
 
     @call_on_thread(dialog.querying)
     def remove_by_record(self, record: Servers.Record) -> None:
-        self.preserve_on_fail = True
-        try:
         res = Servers.query_by_record(record)
         self._parse_single_record(res, delete=True)
-        except Exception as e:
-            logger.warning(e)
-            self.thread_man.set_cleanup_func(
-                StoredFunc(self._cleanup_on_failure), destroy_first=True
-            )
-            return
 
     def update_history(
         self,
@@ -304,6 +280,7 @@ class ServerModelManager:
         proxy_man.update_playercount(self.playercount)
 
     def _parse_single_record(self, response: "A2SInfo", delete: bool = False) -> None:
+        self.preserve_on_fail = True
         try:
             row = response.as_row()
         except Exception as e:

tests/test_config.py

@@ -36,7 +36,6 @@ def keys():
 
 # TODO: use a static fixture instead of system config
 @pytest.fixture
-@pytest.mark.realconfig
 def config():
     paths = get_xdg_paths()
     xdg = parse_filepaths(paths)

tests/test_flatpak_override.py

@@ -1,7 +1,7 @@
 import configparser
 import pytest
 
-from dzgui.const.constants import FLATPAK_APPID, GTK_APP_ID
+from dzgui.const.constants import FLATPAK_APPID, GTK_APP_ID, TMP_PATH
 from dzgui.config.xdg import get_xdg_paths
 from dzgui.util.flatpak import apply_overrides
 
@@ -38,6 +38,8 @@ def test_session_bus(override, config) -> None:
 
 
 def test_paths(override, xdg_paths, config) -> None:
-    expect = xdg_paths
+    expect: list[str] = []
+    expect.append(TMP_PATH)
+    expect.extend([*xdg_paths.values()])
     paths = config[PATHS_KEY][PATHS_SUBKEY].split(";")
-    assert all(str(path) in paths for path in expect.values())
+    assert all(str(path) in paths for path in expect)