chore: resolve pytest errors

dzgui/api/steam.py

@@ -1,14 +1,13 @@
 import logging
 import os
 import psutil
-import re
 import requests
 import subprocess
 import vdf  # type: ignore
 
 from pathlib import Path
 from requests.exceptions import HTTPError
-from typing import Any, Generator, Union
+from typing import Any, Union
 from warnings import deprecated
 
 from dzgui.api.acf import ACF
@@ -21,7 +20,6 @@ from dzgui.const.constants import (
     DAYZ_LAUNCHER,
     DEBIAN_STEAM_PATH,
     DEFAULT_STEAM_PATH,
-    DOWNLOADS_PATH,
     FLATPAK_STEAM_PATH,
     LIBRARYFOLDERS_PATH,
     UBUNTU_STEAM_PATH,
@@ -247,9 +245,9 @@ def find_user_id(path: Path) -> str | None:
             last_user = str(next(iter(users)))
             if len(users) == 1:
                 return last_user
-            last_stamp = int(users[last_user]["Timestamp"])
+            last_stamp = int(users[last_user]["timestamp"])
             for user in users:
-                stamp = int(users[user]["Timestamp"])
+                stamp = int(users[user]["timestamp"])
                 if stamp > last_stamp:
                     last_stamp = stamp
                     last_user = user
@@ -441,22 +439,6 @@ def is_dayz_running() -> bool:
     return any(s in item for sublist in procs for item in sublist for s in substring)
 
 
-def get_pending_downloads(steam_path: Path, appid: int) -> Generator[Path, None, None]:
-    root_path = get_app_path(steam_path, appid)
-    downloads_dir = root_path / DOWNLOADS_PATH
-    files = downloads_dir.iterdir()
-    return files
-
-
-def is_dayz_downloading(steam_path: Path, appid: int) -> bool:
-    files = get_pending_downloads(steam_path, appid)
-    reg = re.compile(rf"^state_(?:{APPID_DAYZ_EXP}|{APPID_DAYZ})_.*\.patch$")
-    pending = [f for f in files if reg.match(f.name)]
-    if len(pending) > 0:
-        return True
-    return False
-
-
 def get_app_path(folders_path: Path, appid: int) -> Path:
     app_path = None
 

dzgui/const/constants.py

@@ -15,7 +15,6 @@ DAYZ_BINARY = "DayZ_x64.exe"
 DAYZ_LAUNCHER = "DayZLauncher.exe"
 
 LIBRARYFOLDERS_PATH = "steamapps/libraryfolders.vdf"
-DOWNLOADS_PATH = "steamapps/downloading"
 WORKSHOP_PATH = "steamapps/workshop/content/" + str(APPID_DAYZ)
 
 STEAM_CMD = "steam"

dzgui/managers/connection.py

@@ -14,7 +14,6 @@ from dzgui.api.shortcuts import Shortcuts
 from dzgui.api.steam import (
     connect,
     connect_debug,
-    is_dayz_downloading,
     get_app_allows_downloads,
     get_app_name,
     get_needs_update,
@@ -85,7 +84,6 @@ class Prerequisites:
     available_space: float
     passworded: bool
     dayz_running: bool
-    download_paused: bool
     steam_proc: SteamProcess
     mods: list[list[str]]
     game_mode: bool
@@ -171,7 +169,6 @@ class ConnectionManager:
                     free_mib = format_mib(free)
 
         dayz_running = is_dayz_running()
-        download_paused = is_dayz_downloading(steam_path, self.appid)
 
         running_app = get_running_app()
         if running_app is not None:
@@ -213,7 +210,6 @@ class ConnectionManager:
             available_space=free_mib,
             passworded=info.password_protected,
             dayz_running=dayz_running,
-            download_paused=download_paused,
             steam_proc=steam_proc,
             mods=remote_mods,
             game_mode=game_mode,

dzgui/strings/preconnect.py

@@ -47,7 +47,3 @@ running_app = (
     "Either stop the game first, or update your global Steam settings or the game's local settings.\n"
     "Otherwise, mods may be queued for download but never update."
 )
-downloads_paused = (
-    "It looks like DayZ may have a pending update on Steam that was paused.\n"
-    "To enqueue mods for download, unpause any pending DayZ update and allow it to complete."
-)

dzgui/views/pages/preconnect.py

@@ -279,8 +279,6 @@ class PreConnectionAssistant(Gtk.Box):
             warnings.append(preconnect.protected_server)
         if prereqs.dayz_running is True:
             warnings.append(preconnect.dayz_running)
-        if len(prereqs.mods) > 0 and prereqs.download_paused:
-            warnings.append(preconnect.downloads_paused)
 
         allows_dl, running_app = prereqs.allows_downloads
         if len(prereqs.mods) > 0 and allows_dl is False:

tests/fixtures/api/loginusers_beta_client.vdf

@@ -8,6 +8,6 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"0"
+		"timestamp"		"0"
 	}
 }

tests/fixtures/api/loginusers_beta_client_multiple.vdf

@@ -8,7 +8,7 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"1787904411"
+		"timestamp"		"1787904411"
 	}
 	"1"
 	{
@@ -18,6 +18,6 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"1787904647"
+		"timestamp"		"1787904647"
 	}
 }

tests/fixtures/api/loginusers_beta_client_multiple_2.vdf

@@ -8,7 +8,7 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"1797904411"
+		"timestamp"		"1797904411"
 	}
 	"1"
 	{
@@ -18,6 +18,6 @@
 		"WantsOfflineMode"		"0"
 		"SkipOfflineModeWarning"		"0"
 		"AutoLogin"		"1"
-		"Timestamp"		"1787904647"
+		"timestamp"		"1787904647"
 	}
 }

tests/fixtures/api/loginusers_legacy_client.vdf

@@ -9,6 +9,6 @@
 		"SkipOfflineModeWarning"		"0"
 		"AllowAutoLogin"		"1"
 		"MostRecent"		"1"
-		"Timestamp"		"0"
+		"timestamp"		"0"
 	}
 }

tests/fixtures/api/loginusers_legacy_client_multiple.vdf

@@ -9,7 +9,7 @@
 		"SkipOfflineModeWarning"		"0"
 		"AllowAutoLogin"		"1"
 		"MostRecent"		"0"
-		"Timestamp"		"0"
+		"timestamp"		"0"
 	}
 	"1"
 	{
@@ -20,6 +20,6 @@
 		"SkipOfflineModeWarning"		"0"
 		"AllowAutoLogin"		"1"
 		"MostRecent"		"1"
-		"Timestamp"		"10"
+		"timestamp"		"10"
 	}
 }

tests/test_colorscheme.py

@@ -10,7 +10,7 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gio, GLib  # noqa
 
 
-class TestWidget(ColorAwareApp, Gtk.Button):
+class DummyWidget(ColorAwareApp, Gtk.Button):
     def __init__(self) -> None:
         super().__init__()
 
@@ -22,11 +22,10 @@ class TestWidget(ColorAwareApp, Gtk.Button):
 
 
 @pytest.fixture
-def widget() -> TestWidget:
+def widget() -> DummyWidget:
-    return TestWidget()
+    return DummyWidget()
 
 
-@pytest.mark.integration
 @pytest.mark.parametrize("key, expect", [("default", False), ("prefer-dark", True)])
 def test_light_mode(widget, key: str, expect: bool) -> None:
     local_pref = subprocess.run(

tests/test_loginusers.py

@@ -3,6 +3,7 @@ import pytest
 from pathlib import Path
 
 from dzgui.api.steam import find_user_id
+from dzgui.const.constants import DEFAULT_STEAM_PATH
 from tests.fixtures import fixture_path
 
 pytestmark = pytest.mark.apitest
@@ -25,3 +26,11 @@ def test_loginusers(monkeypatch, fixture: str, expect: int) -> None:
     monkeypatch.setattr("dzgui.api.steam.find_loginusers", mock_loginusers)
     uid = find_user_id(Path(""))
     assert int(uid) == expect
+
+
+@pytest.mark.realconfig
+def test_live_loginusers() -> None:
+    """Added on 2026-10-17 following changes to VDF keys"""
+    steam = Path.home().joinpath(DEFAULT_STEAM_PATH)
+    uid = find_user_id(steam)
+    assert uid is not None

tests/test_paused_downloads.py

@@ -1,27 +0,0 @@
-import pytest
-from pathlib import Path
-
-from dzgui.api.steam import is_dayz_downloading
-
-
-@pytest.mark.parametrize(
-    "file_list, expect",
-    [
-        (["state_221100_1111.patch"], True),
-        (["state_730_1111.patch"], False),
-        (["state_1024020_1111.patch"], True),
-        (["221100"], False),
-        (["221100", "state_221100_1111.patch"], True),
-        (["state_221100_1111.patch", "state_1024020_1111.patch"], True),
-        (["state_221100_1111"], False),
-    ],
-)
-def test_dayz_patch_pending(monkeypatch, file_list, expect) -> None:
-    def mock_get_pending_downloads(steam_path: Path, appid: int) -> None:
-        files = [Path(file) for file in file_list]
-        return files
-
-    monkeypatch.setattr(
-        "dzgui.api.steam.get_pending_downloads", mock_get_pending_downloads
-    )
-    assert is_dayz_downloading(Path("/tmp"), Path("/tmp")) == expect