test: use BoundModelTestCase (1)

Author: jooola

hcloud/certificates/client.py

@@ -53,7 +53,13 @@ def get_actions_list(
                Specifies how many results are returned by page
         :return: (List[:class:`BoundAction <hcloud.actions.client.BoundAction>`], :class:`Meta <hcloud.core.domain.Meta>`)
         """
-        return self._client.get_actions_list(self, status, sort, page, per_page)
+        return self._client.get_actions_list(
+            self,
+            status=status,
+            sort=sort,
+            page=page,
+            per_page=per_page,
+        )
 
     def get_actions(
         self,
@@ -68,7 +74,11 @@ def get_actions(
                Specify how the results are sorted. Choices: `id` `id:asc` `id:desc` `command` `command:asc` `command:desc` `status` `status:asc` `status:desc` `progress` `progress:asc` `progress:desc` `started` `started:asc` `started:desc` `finished` `finished:asc` `finished:desc`
         :return: List[:class:`BoundAction <hcloud.actions.client.BoundAction>`]
         """
-        return self._client.get_actions(self, status, sort)
+        return self._client.get_actions(
+            self,
+            status=status,
+            sort=sort,
+        )
 
     def update(
         self,
@@ -83,7 +93,11 @@ def update(
                User-defined labels (key-value pairs)
         :return: :class:`BoundCertificate <hcloud.certificates.client.BoundCertificate>`
         """
-        return self._client.update(self, name, labels)
+        return self._client.update(
+            self,
+            name=name,
+            labels=labels,
+        )
 
     def delete(self) -> bool:
         """Deletes a certificate.

hcloud/firewalls/client.py

@@ -140,7 +140,7 @@ def update(
                New Name to set
         :return: :class:`BoundFirewall <hcloud.firewalls.client.BoundFirewall>`
         """
-        return self._client.update(self, labels, name)
+        return self._client.update(self, name=name, labels=labels)
 
     def delete(self) -> bool:
         """Deletes a Firewall.
@@ -155,7 +155,7 @@ def set_rules(self, rules: list[FirewallRule]) -> list[BoundAction]:
         :return: List[:class:`BoundAction <hcloud.actions.client.BoundAction>`]
         """
 
-        return self._client.set_rules(self, rules)
+        return self._client.set_rules(self, rules=rules)
 
     def apply_to_resources(
         self,
@@ -165,7 +165,7 @@ def apply_to_resources(
         :param resources: List[:class:`FirewallResource <hcloud.firewalls.domain.FirewallResource>`]
         :return: List[:class:`BoundAction <hcloud.actions.client.BoundAction>`]
         """
-        return self._client.apply_to_resources(self, resources)
+        return self._client.apply_to_resources(self, resources=resources)
 
     def remove_from_resources(
         self,
@@ -175,7 +175,7 @@ def remove_from_resources(
         :param resources: List[:class:`FirewallResource <hcloud.firewalls.domain.FirewallResource>`]
         :return: List[:class:`BoundAction <hcloud.actions.client.BoundAction>`]
         """
-        return self._client.remove_from_resources(self, resources)
+        return self._client.remove_from_resources(self, resources=resources)
 
 
 class FirewallsPageResult(NamedTuple):

tests/unit/certificates/conftest.py

@@ -4,46 +4,36 @@
 
 
 @pytest.fixture()
-def certificate_response():
+def certificate1():
     return {
-        "certificate": {
-            "id": 2323,
-            "name": "My Certificate",
-            "type": "managed",
-            "labels": {},
-            "certificate": "-----BEGIN CERTIFICATE-----\n...",
-            "created": "2019-01-08T12:10:00+00:00",
-            "not_valid_before": "2019-01-08T10:00:00+00:00",
-            "not_valid_after": "2019-07-08T09:59:59+00:00",
-            "domain_names": ["example.com", "webmail.example.com", "www.example.com"],
-            "fingerprint": "03:c7:55:9b:2a:d1:04:17:09:f6:d0:7f:18:34:63:d4:3e:5f",
-            "status": {
-                "issuance": "failed",
-                "renewal": "scheduled",
-                "error": {"code": "error_code", "message": "error message"},
-            },
-            "used_by": [{"id": 42, "type": "server"}],
-        }
+        "id": 2323,
+        "name": "My Certificate",
+        "type": "managed",
+        "labels": {},
+        "certificate": "-----BEGIN CERTIFICATE-----\n...",
+        "created": "2019-01-08T12:10:00+00:00",
+        "not_valid_before": "2019-01-08T10:00:00+00:00",
+        "not_valid_after": "2019-07-08T09:59:59+00:00",
+        "domain_names": ["example.com", "webmail.example.com", "www.example.com"],
+        "fingerprint": "03:c7:55:9b:2a:d1:04:17:09:f6:d0:7f:18:34:63:d4:3e:5f",
+        "status": {
+            "issuance": "failed",
+            "renewal": "scheduled",
+            "error": {"code": "error_code", "message": "error message"},
+        },
+        "used_by": [{"id": 42, "type": "server"}],
     }
 
 
 @pytest.fixture()
-def create_managed_certificate_response():
+def certificate_response(certificate1):
+    return {"certificate": certificate1}
+
+
+@pytest.fixture()
+def create_managed_certificate_response(certificate1):
     return {
-        "certificate": {
-            "id": 2323,
-            "name": "My Certificate",
-            "type": "managed",
-            "labels": {},
-            "certificate": "-----BEGIN CERTIFICATE-----\n...",
-            "created": "2019-01-08T12:10:00+00:00",
-            "not_valid_before": "2019-01-08T10:00:00+00:00",
-            "not_valid_after": "2019-07-08T09:59:59+00:00",
-            "domain_names": ["example.com", "webmail.example.com", "www.example.com"],
-            "fingerprint": "03:c7:55:9b:2a:d1:04:17:09:f6:d0:7f:18:34:63:d4:3e:5f",
-            "status": {"issuance": "pending", "renewal": "scheduled", "error": None},
-            "used_by": [{"id": 42, "type": "load_balancer"}],
-        },
+        "certificate": certificate1,
         "action": {
             "id": 14,
             "command": "issue_certificate",
@@ -58,27 +48,10 @@ def create_managed_certificate_response():
 
 
 @pytest.fixture()
-def two_certificates_response():
+def two_certificates_response(certificate1):
     return {
         "certificates": [
-            {
-                "id": 2323,
-                "name": "My Certificate",
-                "labels": {},
-                "type": "uploaded",
-                "certificate": "-----BEGIN CERTIFICATE-----\n...",
-                "created": "2019-01-08T12:10:00+00:00",
-                "not_valid_before": "2019-01-08T10:00:00+00:00",
-                "not_valid_after": "2019-07-08T09:59:59+00:00",
-                "domain_names": [
-                    "example.com",
-                    "webmail.example.com",
-                    "www.example.com",
-                ],
-                "fingerprint": "03:c7:55:9b:2a:d1:04:17:09:f6:d0:7f:18:34:63:d4:3e:5f",
-                "status": None,
-                "used_by": [{"id": 42, "type": "load_balancer"}],
-            },
+            certificate1,
             {
                 "id": 2324,
                 "name": "My website cert",
@@ -102,29 +75,8 @@ def two_certificates_response():
 
 
 @pytest.fixture()
-def one_certificates_response():
-    return {
-        "certificates": [
-            {
-                "id": 2323,
-                "name": "My Certificate",
-                "labels": {},
-                "type": "uploaded",
-                "certificate": "-----BEGIN CERTIFICATE-----\n...",
-                "created": "2019-01-08T12:10:00+00:00",
-                "not_valid_before": "2019-01-08T10:00:00+00:00",
-                "not_valid_after": "2019-07-08T09:59:59+00:00",
-                "domain_names": [
-                    "example.com",
-                    "webmail.example.com",
-                    "www.example.com",
-                ],
-                "fingerprint": "03:c7:55:9b:2a:d1:04:17:09:f6:d0:7f:18:34:63:d4:3e:5f",
-                "status": None,
-                "used_by": [{"id": 42, "type": "load_balancer"}],
-            }
-        ]
-    }
+def one_certificates_response(certificate1):
+    return {"certificates": [certificate1]}
 
 
 @pytest.fixture()

tests/unit/certificates/test_client.py

@@ -12,88 +12,40 @@
     ManagedCertificateStatus,
 )
 
+from ..conftest import BoundModelTestCase
 
-class TestBoundCertificate:
-    @pytest.fixture()
-    def bound_certificate(self, client: Client):
-        return BoundCertificate(client.certificates, data=dict(id=14))
-
-    def test_bound_certificate_init(self, certificate_response):
-        bound_certificate = BoundCertificate(
-            client=mock.MagicMock(), data=certificate_response["certificate"]
-        )
 
-        assert bound_certificate.id == 2323
-        assert bound_certificate.name == "My Certificate"
-        assert bound_certificate.type == "managed"
-        assert (
-            bound_certificate.fingerprint
-            == "03:c7:55:9b:2a:d1:04:17:09:f6:d0:7f:18:34:63:d4:3e:5f"
-        )
-        assert bound_certificate.certificate == "-----BEGIN CERTIFICATE-----\n..."
-        assert len(bound_certificate.domain_names) == 3
-        assert bound_certificate.domain_names[0] == "example.com"
-        assert bound_certificate.domain_names[1] == "webmail.example.com"
-        assert bound_certificate.domain_names[2] == "www.example.com"
-        assert isinstance(bound_certificate.status, ManagedCertificateStatus)
-        assert bound_certificate.status.issuance == "failed"
-        assert bound_certificate.status.renewal == "scheduled"
-        assert bound_certificate.status.error.code == "error_code"
-        assert bound_certificate.status.error.message == "error message"
+class TestBoundCertificate(BoundModelTestCase):
+    methods = [
+        BoundCertificate.update,
+        BoundCertificate.delete,
+        BoundCertificate.retry_issuance,
+    ]
 
-    def test_update(
-        self,
-        request_mock: mock.MagicMock,
-        bound_certificate,
-        response_update_certificate,
-    ):
-        request_mock.return_value = response_update_certificate
-
-        certificate = bound_certificate.update(name="New name")
-
-        request_mock.assert_called_with(
-            method="PUT",
-            url="/certificates/14",
-            json={"name": "New name"},
-        )
-
-        assert certificate.id == 2323
-        assert certificate.name == "New name"
-
-    def test_delete(
-        self,
-        request_mock: mock.MagicMock,
-        bound_certificate,
-        action_response,
-    ):
-        request_mock.return_value = action_response
-
-        delete_success = bound_certificate.delete()
-
-        request_mock.assert_called_with(
-            method="DELETE",
-            url="/certificates/14",
-        )
-
-        assert delete_success is True
-
-    def test_retry_issuance(
-        self,
-        request_mock: mock.MagicMock,
-        bound_certificate,
-        response_retry_issuance_action,
-    ):
-        request_mock.return_value = response_retry_issuance_action
-
-        action = bound_certificate.retry_issuance()
-
-        request_mock.assert_called_with(
-            method="POST",
-            url="/certificates/14/actions/retry",
-        )
+    @pytest.fixture()
+    def resource_client(self, client: Client):
+        return client.certificates
 
-        assert action.id == 14
-        assert action.command == "issue_certificate"
+    @pytest.fixture()
+    def bound_model(self, resource_client, certificate1):
+        return BoundCertificate(resource_client, data=certificate1)
+
+    def test_init(self, bound_model: BoundCertificate):
+        o = bound_model
+        assert o.id == 2323
+        assert o.name == "My Certificate"
+        assert o.type == "managed"
+        assert o.fingerprint == "03:c7:55:9b:2a:d1:04:17:09:f6:d0:7f:18:34:63:d4:3e:5f"
+        assert o.certificate == "-----BEGIN CERTIFICATE-----\n..."
+        assert len(o.domain_names) == 3
+        assert o.domain_names[0] == "example.com"
+        assert o.domain_names[1] == "webmail.example.com"
+        assert o.domain_names[2] == "www.example.com"
+        assert isinstance(o.status, ManagedCertificateStatus)
+        assert o.status.issuance == "failed"
+        assert o.status.renewal == "scheduled"
+        assert o.status.error.code == "error_code"
+        assert o.status.error.message == "error message"
 
 
 class TestCertificatesClient: