From 879d0650d4e80432dd6349b3ad672e299ec4e12e Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sun, 21 Jun 2026 22:17:38 +0900
Subject: [PATCH 1/4] fix: insert missing values prior to serialization

---
 dzgui/config/convert.py  |  6 ++++++
 tests/fixtures/dztuirc_1 | 45 ++++++++++++++++++++++++++++++++++++++++
 tests/fixtures/dztuirc_2 | 45 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 tests/fixtures/dztuirc_1
 create mode 100644 tests/fixtures/dztuirc_2

diff --git a/dzgui/config/convert.py b/dzgui/config/convert.py
index 8061adb..26fabf2 100644
--- a/dzgui/config/convert.py
+++ b/dzgui/config/convert.py
@@ -3,6 +3,8 @@ import shlex
 from pathlib import Path
 from typing import Any
 
+from dzgui.const.boilerplate import config_boilerplate
+
 
 """
 Convert legacy dztuirc to config.json
@@ -89,4 +91,8 @@ def rc2json(file: Path) -> str:
     keys["ip_list"] = ips
     keys["use_miles"] = False
     keys["start_tab"] = 0
+    # NOTE: workaround for DZGUI 6 logic (see #375)
+    for key in config_boilerplate.keys():
+        if key not in keys:
+            keys[key] = config_boilerplate[key]
     return json.dumps(keys, indent=2)
diff --git a/tests/fixtures/dztuirc_1 b/tests/fixtures/dztuirc_1
new file mode 100644
index 0000000..9ba40aa
--- /dev/null
+++ b/tests/fixtures/dztuirc_1
@@ -0,0 +1,45 @@
+#Path to DayZ installation
+steam_path="/tmp"
+
+#Battlemetrics API key
+api_key=""
+
+#Favorited server IP:PORT array
+ip_list=(
+)
+
+#Favorite server to fast-connect to (limit one)
+fav_server=""
+
+#Favorite server label (human readable)
+fav_label=""
+
+#Custom player name (optional, required by some servers)
+name=""
+
+#Set to 1 to perform dry-run and print launch options
+debug="1"
+
+#Toggle stable/testing branch
+branch="testing"
+
+#Start in fullscreen
+fullscreen="false"
+
+#Steam API key
+steam_api=""
+
+#Auto-install mods
+auto_install="2"
+
+#Automod staging directory
+staging_dir="/tmp"
+
+#Path to default Steam client
+default_steam_path="/tmp"
+
+#Preferred Steam launch command (for Flatpak support)
+preferred_client="steam"
+
+#DZGUI source path
+src_path=""
diff --git a/tests/fixtures/dztuirc_2 b/tests/fixtures/dztuirc_2
new file mode 100644
index 0000000..6869f4a
--- /dev/null
+++ b/tests/fixtures/dztuirc_2
@@ -0,0 +1,45 @@
+#Path to DayZ installation
+steam_path="/tmp"
+
+#Battlemetrics API key
+api_key=""
+
+#Favorited server IP:PORT array
+ip_list=(
+)
+
+#Favorite server to fast-connect to (limit one)
+fav_server=""
+
+#Favorite server label (human readable)
+fav_label=""
+
+#Custom player name (optional, required by some servers)
+name=""
+
+#Set to 1 to perform dry-run and print launch options
+debug=""
+
+#Toggle stable/testing branch
+branch="testing"
+
+#Start in fullscreen
+fullscreen="false"
+
+#Steam API key
+steam_api=""
+
+#Auto-install mods
+auto_install="0"
+
+#Automod staging directory
+staging_dir="/tmp"
+
+#Path to default Steam client
+default_steam_path="/tmp"
+
+#Preferred Steam launch command (for Flatpak support)
+preferred_client="steam"
+
+#DZGUI source path
+src_path=""

From a2aeac0242760184d186dc74eaeb831cd648cb3d Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sun, 21 Jun 2026 22:18:02 +0900
Subject: [PATCH 2/4] fix: workaround for circular import in tests

---
 dzgui/api/steam.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dzgui/api/steam.py b/dzgui/api/steam.py
index 397080c..88df5b4 100644
--- a/dzgui/api/steam.py
+++ b/dzgui/api/steam.py
@@ -10,7 +10,6 @@ from shlex import shlex
 from pathlib import Path
 
 from dzgui.init.prereqs import has_steam_client
-from dzgui.api.mods import _hash
 from dzgui.const.constants import (
     APPID_DAYZ,
     APP_NAME,
@@ -58,6 +57,9 @@ def get_steam_paths() -> list[tuple[Path, str]]:
 
 
 def concat_mods(mods: list[str]) -> str:
+    # TODO: circular import workaround
+    from dzgui.api.mods import _hash
+
     hashes = []
     for mod in mods:
         md5sum = _hash(mod)

From 8695793af41128957c537f0412ef05205a56144c Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sun, 21 Jun 2026 22:18:35 +0900
Subject: [PATCH 3/4] chore: add config test

---
 pyproject.toml       |  1 +
 tests/test_config.py | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 3f66822..374fec6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -107,6 +107,7 @@ config-settings-package = { pygobject-stubs = { config = "Gtk3,Gdk3,Soup2" } }
 [tool.pytest.ini_options]
 markers = [
     "config: config file keys/values",
+    "mods: tests mod metadata/link creation",
     "pefile: validate PE files",
     "post_install: requires a completed installation",
     "slow: long-running tests",
diff --git a/tests/test_config.py b/tests/test_config.py
index 4cfd754..72c0460 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,6 +1,7 @@
 import json
 import pytest
 
+from dzgui.const.boilerplate import config_boilerplate
 from dzgui.config.query import get_config
 from dzgui.config.xdg import get_xdg_paths, parse_filepaths
 from dzgui.config import convert
@@ -11,7 +12,11 @@ pytestmark = pytest.mark.config
 
 @pytest.fixture
 def legacy_config():
-    return fixture_path("dztuirc_one")
+    return fixture_path("dztuirc_1")
+
+@pytest.fixture
+def unset_values():
+    return fixture_path("dztuirc_3")
 
 
 @pytest.fixture
@@ -60,8 +65,8 @@ def test_contains_invalid_values(keys, config):
 @pytest.mark.parametrize(
     "fixture, expect",
     [
-        ("dztuirc_one", (False, True, True)),
-        ("dztuirc_two", (False, False, False)),
+        ("dztuirc_1", (False, True, True)),
+        ("dztuirc_2", (False, False, False)),
     ],
 )
 def test_bool_conversion(fixture, expect):
@@ -86,5 +91,12 @@ def test_key_conversion(legacy_config):
     for key in keys:
         assert key not in j
 
+def test_missing_values(unset_values):
+    j = convert.rc2json(unset_values)
+    j = json.loads(j)
+    assert j.keys() == config_boilerplate.keys()
+
+
+
 
 # TODO: test that when a config file is created from scratch, it contains all values

From a559485d0a09e049a8a5a2676ac6c512ec1dbf78 Mon Sep 17 00:00:00 2001
From: aclist <92275929+aclist@users.noreply.github.com>
Date: Sun, 21 Jun 2026 22:20:38 +0900
Subject: [PATCH 4/4] chore: change structure of fixtures

---
 .../fixtures/cpp/{meta1.cpp => mod1/meta.cpp} |  0
 .../fixtures/cpp/{meta2.cpp => mod2/meta.cpp} |  0
 .../fixtures/cpp/{meta3.cpp => mod3/meta.cpp} |  0
 .../fixtures/cpp/{meta4.cpp => mod4/meta.cpp} |  0
 .../fixtures/cpp/{meta5.cpp => mod5/meta.cpp} |  0
 .../fixtures/cpp/{meta6.cpp => mod6/meta.cpp} |  0
 tests/fixtures/cpp/test.py                    |  3 --
 tests/fixtures/{dztuirc_one => dztuirc_3}     |  3 --
 tests/fixtures/dztuirc_two                    | 45 -------------------
 tests/test_modmeta.py                         | 18 +++-----
 10 files changed, 7 insertions(+), 62 deletions(-)
 rename tests/fixtures/cpp/{meta1.cpp => mod1/meta.cpp} (100%)
 rename tests/fixtures/cpp/{meta2.cpp => mod2/meta.cpp} (100%)
 rename tests/fixtures/cpp/{meta3.cpp => mod3/meta.cpp} (100%)
 rename tests/fixtures/cpp/{meta4.cpp => mod4/meta.cpp} (100%)
 rename tests/fixtures/cpp/{meta5.cpp => mod5/meta.cpp} (100%)
 rename tests/fixtures/cpp/{meta6.cpp => mod6/meta.cpp} (100%)
 delete mode 100644 tests/fixtures/cpp/test.py
 rename tests/fixtures/{dztuirc_one => dztuirc_3} (94%)
 delete mode 100644 tests/fixtures/dztuirc_two

diff --git a/tests/fixtures/cpp/meta1.cpp b/tests/fixtures/cpp/mod1/meta.cpp
similarity index 100%
rename from tests/fixtures/cpp/meta1.cpp
rename to tests/fixtures/cpp/mod1/meta.cpp
diff --git a/tests/fixtures/cpp/meta2.cpp b/tests/fixtures/cpp/mod2/meta.cpp
similarity index 100%
rename from tests/fixtures/cpp/meta2.cpp
rename to tests/fixtures/cpp/mod2/meta.cpp
diff --git a/tests/fixtures/cpp/meta3.cpp b/tests/fixtures/cpp/mod3/meta.cpp
similarity index 100%
rename from tests/fixtures/cpp/meta3.cpp
rename to tests/fixtures/cpp/mod3/meta.cpp
diff --git a/tests/fixtures/cpp/meta4.cpp b/tests/fixtures/cpp/mod4/meta.cpp
similarity index 100%
rename from tests/fixtures/cpp/meta4.cpp
rename to tests/fixtures/cpp/mod4/meta.cpp
diff --git a/tests/fixtures/cpp/meta5.cpp b/tests/fixtures/cpp/mod5/meta.cpp
similarity index 100%
rename from tests/fixtures/cpp/meta5.cpp
rename to tests/fixtures/cpp/mod5/meta.cpp
diff --git a/tests/fixtures/cpp/meta6.cpp b/tests/fixtures/cpp/mod6/meta.cpp
similarity index 100%
rename from tests/fixtures/cpp/meta6.cpp
rename to tests/fixtures/cpp/mod6/meta.cpp
diff --git a/tests/fixtures/cpp/test.py b/tests/fixtures/cpp/test.py
deleted file mode 100644
index 453b6d7..0000000
--- a/tests/fixtures/cpp/test.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from dzgui.api.mods import tokenize
-
-print(tokenize("meta4.cpp"))
diff --git a/tests/fixtures/dztuirc_one b/tests/fixtures/dztuirc_3
similarity index 94%
rename from tests/fixtures/dztuirc_one
rename to tests/fixtures/dztuirc_3
index 9ba40aa..c7a32f4 100644
--- a/tests/fixtures/dztuirc_one
+++ b/tests/fixtures/dztuirc_3
@@ -23,9 +23,6 @@ debug="1"
 #Toggle stable/testing branch
 branch="testing"
 
-#Start in fullscreen
-fullscreen="false"
-
 #Steam API key
 steam_api=""
 
diff --git a/tests/fixtures/dztuirc_two b/tests/fixtures/dztuirc_two
deleted file mode 100644
index 6869f4a..0000000
--- a/tests/fixtures/dztuirc_two
+++ /dev/null
@@ -1,45 +0,0 @@
-#Path to DayZ installation
-steam_path="/tmp"
-
-#Battlemetrics API key
-api_key=""
-
-#Favorited server IP:PORT array
-ip_list=(
-)
-
-#Favorite server to fast-connect to (limit one)
-fav_server=""
-
-#Favorite server label (human readable)
-fav_label=""
-
-#Custom player name (optional, required by some servers)
-name=""
-
-#Set to 1 to perform dry-run and print launch options
-debug=""
-
-#Toggle stable/testing branch
-branch="testing"
-
-#Start in fullscreen
-fullscreen="false"
-
-#Steam API key
-steam_api=""
-
-#Auto-install mods
-auto_install="0"
-
-#Automod staging directory
-staging_dir="/tmp"
-
-#Path to default Steam client
-default_steam_path="/tmp"
-
-#Preferred Steam launch command (for Flatpak support)
-preferred_client="steam"
-
-#DZGUI source path
-src_path=""
diff --git a/tests/test_modmeta.py b/tests/test_modmeta.py
index f2f4ca4..8002825 100644
--- a/tests/test_modmeta.py
+++ b/tests/test_modmeta.py
@@ -1,17 +1,13 @@
 import pytest
+from pathlib import Path
+
 from dzgui.api.mods import tokenize
 from tests.fixtures import fixture_path
 
 @pytest.mark.mods
-@pytest.mark.parametrize("fixture", [
-    fixture_path("cpp/meta1.cpp"),
-    fixture_path("cpp/meta2.cpp"),
-    fixture_path("cpp/meta3.cpp"),
-    fixture_path("cpp/meta4.cpp"),
-    fixture_path("cpp/meta5.cpp"),
-    fixture_path("cpp/meta6.cpp"),
-    ]
-)
-def test_modmeta(fixture: str) -> None:
-    meta = tokenize(fixture)
+@pytest.mark.parametrize("i", range(1, 7))
+def test_modmeta(i: int) -> None:
+    fixture = fixture_path(f"cpp/mod{i}")
+    path = Path(fixture)
+    meta = tokenize(path)
     assert meta["name"] == "ModName"