Convert some tests

Author: Josef-Friedrich

dyndns/dns.py

@@ -12,6 +12,7 @@
 import dns.message
 import dns.name
 import dns.query
+import dns.rdatatype
 import dns.resolver
 import dns.rrset
 import dns.tsig

tests/conftest.py

@@ -4,10 +4,11 @@
 
 import pytest
 from flask import Flask
-from flask.testing import FlaskClient, FlaskCliRunner
+from flask.testing import FlaskClient
 
 from dyndns.dns import DnsZone
 from dyndns.environment import ConfiguredEnvironment
+from dyndns.types import RecordType
 from dyndns.webapp import create_app
 
 
@@ -29,15 +30,36 @@ def app(env: ConfiguredEnvironment) -> Generator[Flask, Any, None]:
             "TESTING": True,
         }
     )
-
     yield app
 
 
 @pytest.fixture()
-def client(app: Flask) -> FlaskClient:
+def flask_client(app: Flask) -> FlaskClient:
     return app.test_client()
 
 
+class TestClient:
+    __test__ = False
+
+    client: FlaskClient
+
+    dns: DnsZone
+
+    def __init__(self, client: FlaskClient, dns: DnsZone):
+        self.client = client
+        self.dns = dns
+
+    def get(self, path: str) -> str:
+        response = self.client.get(path)
+        return response.data.decode()
+
+    def add_record(self, name: str, record_type: RecordType, content: str) -> None:
+        self.dns.add_record(name, record_type, content)
+
+    def delete_record(self, name: str, record_type: RecordType) -> None:
+        self.dns.delete_record(name, record_type)
+
+
 @pytest.fixture()
-def runner(app: Flask) -> FlaskCliRunner:
-    return app.test_cli_runner()
+def client(flask_client: FlaskClient, dns: DnsZone) -> TestClient:
+    return TestClient(flask_client, dns)

tests/files/dyndnsX.dev.yml

@@ -1,5 +1,5 @@
 ---
-secret: 12345678
+secret: '12345678'
 nameserver: 127.0.0.1
 port: 55553
 dyndns_domain: dyndns1.dev.

tests/test_dns_real_world.py renamed to tests/test_dns.py

@@ -9,6 +9,7 @@
 from dyndns.environment import ConfiguredEnvironment
 from dyndns.webapp import create_app
 from tests import _helper
+from tests.conftest import TestClient
 
 
 class TestIntegration:
@@ -80,29 +81,27 @@ def test_call_secret_fqdn_ip1_ip2(self, update: mock.Mock) -> None:
         )
 
 
-class TestUpdateByPath(TestIntegration):
-    """Test the path ``update-by-path`` of the Flask web app."""
-
+class TestUpdateByPath:
     @staticmethod
     def _url(path: str) -> str:
-        return f"/update-by-path/12345678/www.example.com/{path}"
-
-    @pytest.mark.skip
-    def test_ipv4_update(self) -> None:
-        self.get(self._url("1.2.3.5"), [["1.2.3.4"], ["1.2.3.5"]])
+        return f"/update-by-path/12345678/test.dyndns1.dev/{path}"
 
-        self.mock_update.delete.assert_has_calls(
-            [
-                mock.call("www.example.com.", "A"),
-                mock.call("www.example.com.", "AAAA"),
-            ]
-        )
-        self.mock_update.add.assert_called_with("www.example.com.", 300, "A", "1.2.3.5")
+    def test_ipv4_update(self, client: TestClient) -> None:
+        client.delete_record("test", "A")
+        client.add_record("test", "A", "1.2.3.4")
         assert (
-            self.data == "UPDATED: fqdn: www.example.com. old_ip: 1.2.3.4 new_ip: "
-            "1.2.3.5\n"
+            client.get(self._url("1.2.3.5"))
+            == "UPDATED: test.dyndns1.dev. A 1.2.3.4 -> 1.2.3.5\nUNCHANGED: test.dyndns1.dev. AAAA None\n"
         )
 
+
+class TestUpdateByPathOld(TestIntegration):
+    """Test the path ``update-by-path`` of the Flask web app."""
+
+    @staticmethod
+    def _url(path: str) -> str:
+        return f"/update-by-path/12345678/www.dyndns1.dev/{path}"
+
     @pytest.mark.skip
     def test_ipv6_update(self) -> None:
         self.get(self._url("1::3"), [["1::2"], ["1::3"]])
@@ -254,12 +253,12 @@ def test_deletion(self) -> None:
 
 
 class TestMultiplePaths(TestIntegration):
-    def test_home(self, client: FlaskClient) -> None:
-        response = client.get("/")
+    def test_home(self, flask_client: FlaskClient) -> None:
+        response = flask_client.get("/")
         assert b"dyndns" in response.data
 
-    def test_check(self, client: FlaskClient) -> None:
-        response = client.get("/check")
+    def test_check(self, flask_client: FlaskClient) -> None:
+        response = flask_client.get("/check")
         content = response.data.decode()
         assert "could be updated on the zone 'dyndns1.dev.'" in content
         assert "could be updated on the zone 'dyndns2.dev.'" in content