From: Vasek Sraier Date: Tue, 11 Jan 2022 12:12:21 +0000 (+0100) Subject: tests: fix after recent rename of an exception X-Git-Tag: v6.0.0a1~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d0734e1b9c7db77842ef87b84bf431842a51e0b;p=thirdparty%2Fknot-resolver.git tests: fix after recent rename of an exception --- diff --git a/manager/tests/unit/datamodel/test_datamodel_types.py b/manager/tests/unit/datamodel/test_datamodel_types.py index f3eee9eeb..85b4e2931 100644 --- a/manager/tests/unit/datamodel/test_datamodel_types.py +++ b/manager/tests/unit/datamodel/test_datamodel_types.py @@ -16,29 +16,29 @@ from knot_resolver_manager.datamodel.types import ( SizeUnit, TimeUnit, ) -from knot_resolver_manager.exceptions import KresdManagerException +from knot_resolver_manager.exceptions import KresManagerException from knot_resolver_manager.utils import SchemaNode def test_size_unit(): assert SizeUnit("5368709120B") == SizeUnit("5242880K") == SizeUnit("5120M") == SizeUnit("5G") - with raises(KresdManagerException): + with raises(KresManagerException): SizeUnit("-5368709120B") - with raises(KresdManagerException): + with raises(KresManagerException): SizeUnit(-5368709120) - with raises(KresdManagerException): + with raises(KresManagerException): SizeUnit("5120MM") def test_time_unit(): assert TimeUnit("1d") == TimeUnit("24h") == TimeUnit("1440m") == TimeUnit("86400s") - with raises(KresdManagerException): + with raises(KresManagerException): TimeUnit("-1") - with raises(KresdManagerException): + with raises(KresManagerException): TimeUnit(-24) - with raises(KresdManagerException): + with raises(KresManagerException): TimeUnit("1440mm") assert TimeUnit("10ms").millis() == 10 @@ -75,7 +75,7 @@ def test_domain_name(): assert str(o.name) == "test.domain.com" assert o.name == DomainName("test.domain.com") - with raises(KresdManagerException): + with raises(KresManagerException): TestSchema({"name": "b@d.domain.com."}) @@ -99,15 +99,15 @@ def test_ipaddress_port(): assert str(o.ip_port) == "2001:db8::1000@53" assert o.ip_port == IPAddressPort("2001:db8::1000@53") - with raises(KresdManagerException): + with raises(KresManagerException): TestSchema({"ip-port": "123.4.5.6.7"}) - with raises(KresdManagerException): + with raises(KresManagerException): TestSchema({"ip-port": "2001:db8::10000"}) - with raises(KresdManagerException): + with raises(KresManagerException): TestSchema({"ip-port": "123.4.5.6@"}) - with raises(KresdManagerException): + with raises(KresManagerException): TestSchema({"ip-port": "123.4.5.6@-1"}) - with raises(KresdManagerException): + with raises(KresManagerException): TestSchema({"ip-port": "123.4.5.6@65536"}) @@ -123,7 +123,7 @@ def test_ipaddress(): assert str(o.ip) == "2001:db8::1000" assert o.ip == IPv6Address("2001:db8::1000") - with raises(KresdManagerException): + with raises(KresManagerException): TestSchema({"ip": "123456"}) @@ -153,9 +153,9 @@ def test_listen(): assert o.interface is None # check failure - with raises(KresdManagerException): + with raises(KresManagerException): Listen({"unix-socket": "/tmp", "ip": "127.0.0.1"}) - with raises(KresdManagerException): + with raises(KresManagerException): Listen({"unix-socket": "/tmp", "port": 853}) @@ -164,7 +164,7 @@ def test_network(): assert o.to_std().prefixlen == 24 assert o.to_std() == ipaddress.IPv4Network("10.11.12.0/24") - with raises(KresdManagerException): + with raises(KresManagerException): # because only the prefix can have non-zero bits IPNetwork("10.11.12.13/8") @@ -172,8 +172,8 @@ def test_network(): def test_ipv6_96_network(): _ = IPv6Network96("fe80::/96") - with raises(KresdManagerException): + with raises(KresManagerException): IPv6Network96("fe80::/95") - with raises(KresdManagerException): + with raises(KresManagerException): IPv6Network96("10.11.12.3/96") diff --git a/manager/tests/unit/datamodel/test_lua_schema.py b/manager/tests/unit/datamodel/test_lua_schema.py index de69a84dc..11a758ecc 100644 --- a/manager/tests/unit/datamodel/test_lua_schema.py +++ b/manager/tests/unit/datamodel/test_lua_schema.py @@ -1,7 +1,7 @@ from pytest import raises from knot_resolver_manager.datamodel.lua_schema import LuaSchema -from knot_resolver_manager.exceptions import KresdManagerException +from knot_resolver_manager.exceptions import KresManagerException tree = {"script-only": True, "script": "-- lua script"} strict = LuaSchema(tree) @@ -13,5 +13,5 @@ def test_validating(): def test_exception_raises(): - with raises(KresdManagerException): + with raises(KresManagerException): LuaSchema({"script": "-- lua script", "script-file": "path/to/file"}) diff --git a/manager/tests/unit/datamodel/test_policy_schema.py b/manager/tests/unit/datamodel/test_policy_schema.py index 8755fd035..4fce14dd0 100644 --- a/manager/tests/unit/datamodel/test_policy_schema.py +++ b/manager/tests/unit/datamodel/test_policy_schema.py @@ -1,7 +1,7 @@ from pytest import raises from knot_resolver_manager.datamodel.policy_schema import PolicySchema -from knot_resolver_manager.exceptions import KresdManagerException +from knot_resolver_manager.exceptions import KresManagerException def test_simple_actions(): @@ -15,39 +15,39 @@ def test_simple_actions(): assert PolicySchema({"action": "qtrace"}) assert PolicySchema({"action": "reqtrace"}) - with raises(KresdManagerException): + with raises(KresManagerException): PolicySchema({"action": "invalid-action"}) def test_deny_message(): assert PolicySchema({"action": "deny", "message": "this is deny message"}) - with raises(KresdManagerException): + with raises(KresManagerException): PolicySchema({"action": "pass", "message": "this is deny message"}) def test_reroute(): assert PolicySchema({"action": "reroute", "reroute": [{"source": "192.0.2.0/24", "destination": "127.0.0.0"}]}) - with raises(KresdManagerException): + with raises(KresManagerException): PolicySchema({"action": "reroute"}) - with raises(KresdManagerException): + with raises(KresManagerException): PolicySchema({"action": "pass", "reroute": [{"source": "192.0.2.0/24", "destination": "127.0.0.0"}]}) def test_answer(): assert PolicySchema({"action": "answer", "answer": {"qtype": "AAAA", "rdata": "::1"}}) - with raises(KresdManagerException): + with raises(KresManagerException): PolicySchema({"action": "answer"}) - with raises(KresdManagerException): + with raises(KresManagerException): PolicySchema({"action": "pass", "answer": {"qtype": "AAAA", "rdata": "::1"}}) def test_mirror(): assert PolicySchema({"action": "mirror", "mirror": ["127.0.0.1@5353"]}) - with raises(KresdManagerException): + with raises(KresManagerException): PolicySchema({"action": "mirror"}) - with raises(KresdManagerException): + with raises(KresManagerException): PolicySchema({"action": "pass", "mirror": ["127.0.0.1@5353"]}) diff --git a/manager/tests/unit/datamodel/test_rpz_schema.py b/manager/tests/unit/datamodel/test_rpz_schema.py index 76610957c..8ba7f5fae 100644 --- a/manager/tests/unit/datamodel/test_rpz_schema.py +++ b/manager/tests/unit/datamodel/test_rpz_schema.py @@ -1,12 +1,12 @@ from pytest import raises from knot_resolver_manager.datamodel.rpz_schema import RPZSchema -from knot_resolver_manager.exceptions import KresdManagerException +from knot_resolver_manager.exceptions import KresManagerException def test_message(): assert RPZSchema({"action": "deny", "file": "blocklist.rpz", "message": "this is deny message"}) - with raises(KresdManagerException): + with raises(KresManagerException): RPZSchema({"action": "pass", "file": "whitelist.rpz", "message": "this is deny message"}) diff --git a/manager/tests/unit/datamodel/test_server_schema.py b/manager/tests/unit/datamodel/test_server_schema.py index 636ebba1c..a95fab41d 100644 --- a/manager/tests/unit/datamodel/test_server_schema.py +++ b/manager/tests/unit/datamodel/test_server_schema.py @@ -1,11 +1,11 @@ from pytest import raises from knot_resolver_manager.datamodel.server_schema import ServerSchema -from knot_resolver_manager.exceptions import KresdManagerException +from knot_resolver_manager.exceptions import KresManagerException def test_watchdog(): assert ServerSchema({"watchdog": {"qname": "nic.cz.", "qtype": "A"}}) - with raises(KresdManagerException): + with raises(KresManagerException): ServerSchema({"backend": "supervisord", "watchdog": {"qname": "nic.cz.", "qtype": "A"}})