manager: tests: datamodel: 'id' removed from tests

diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/stop_when_manager_fatal.py b/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/stop_when_manager_fatal.py
index 28b3764c8324ce3a727cc3e4ecc6fc3e865be569..ff1973ac34939245a2ab1ebd132a59e35a9a9f19 100644 (file)
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/stop_when_manager_fatal.py
+++ b/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/stop_when_manager_fatal.py
@@ -2,7 +2,6 @@
 # pylint: disable=protected-access
 import atexit
 import os
-
 from typing import Any, Optional
 
 from supervisor.compat import as_string

diff --git a/manager/tests/unit/datamodel/test_config_schema.py b/manager/tests/unit/datamodel/test_config_schema.py
index 4b18843c3cab431f6d28204721df9ee5cfdec694..5023347344e98a0d4874d1b7d76ae256d7462c64 100644 (file)
--- a/manager/tests/unit/datamodel/test_config_schema.py
+++ b/manager/tests/unit/datamodel/test_config_schema.py
@@ -1,29 +1,24 @@
 import json
 from typing import Any, Dict, cast
 
-from pytest import raises
-
 from knot_resolver_manager.datamodel import KresConfig
-from knot_resolver_manager.exceptions import SchemaException
-from knot_resolver_manager.utils.modelling import SchemaNode
-from tests.unit.utils import test_instance_of_kres_config
 
 
 def test_config_defaults():
-    config = test_instance_of_kres_config()
+    config = KresConfig()
 
     # DNS64 default
     assert config.dns64 == False
 
 
 def test_dnssec_false():
-    config = KresConfig({"id": "test", "dnssec": False})
+    config = KresConfig({"dnssec": False})
 
     assert config.dnssec == False
 
 
 def test_dnssec_default_true():
-    config = test_instance_of_kres_config()
+    config = KresConfig()
 
     # DNSSEC defaults
     assert config.dnssec.trust_anchor_sentinel == True
@@ -38,7 +33,7 @@ def test_dnssec_default_true():
 
 
 def test_dns64_prefix_default():
-    assert str(KresConfig({"id": "test", "dns64": True}).dns64.prefix) == "64:ff9b::/96"
+    assert str(KresConfig({"dns64": True}).dns64.prefix) == "64:ff9b::/96"
 
 
 def test_config_json_schema():

diff --git a/manager/tests/unit/test_config_store.py b/manager/tests/unit/test_config_store.py
index 69f25bdf071815a7d608a43331afbec96f6f0e92..9b843bb92f6ca9a19b1e816465834064a02a0c1c 100644 (file)
--- a/manager/tests/unit/test_config_store.py
+++ b/manager/tests/unit/test_config_store.py
@@ -2,7 +2,6 @@ import pytest
 
 from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes
 from knot_resolver_manager.datamodel.config_schema import KresConfig
-from tests.unit.utils import test_instance_of_kres_config
 
 
 @pytest.mark.asyncio  # type: ignore
@@ -14,18 +13,18 @@ async def test_only_once():
         nonlocal count
         count += 1
 
-    config = test_instance_of_kres_config()
+    config = KresConfig()
     store = ConfigStore(config)
 
     await store.register_on_change_callback(change_callback)
     assert count == 1
 
-    config = test_instance_of_kres_config()
+    config = KresConfig()
     config.logging.level = "crit"
     await store.update(config)
     assert count == 2
 
-    config = test_instance_of_kres_config()
+    config = KresConfig()
     config.lua.script_only = True
     config.lua.script = "meaningless value"
     await store.update(config)

diff --git a/manager/tests/unit/utils.py b/manager/tests/unit/utils.py
deleted file mode 100644 (file)
index 66f5afc..0000000
--- a/manager/tests/unit/utils.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from knot_resolver_manager.datamodel.config_schema import KresConfig
-
-
-def test_instance_of_kres_config() -> KresConfig:
-    """
-    Creates an instance of KresConfig without requiring any arguments.
-    """
-    return KresConfig({"id": "test"})