Skip to content

Commit 5f251a0

Browse files
committed
test: handle deprecation warnings
1 parent 34ba176 commit 5f251a0

File tree

3 files changed

+43
-28
lines changed

3 files changed

+43
-28
lines changed

tests/unit/conftest.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import annotations
44

55
import inspect
6+
import warnings
67
from collections.abc import Callable
78
from typing import ClassVar, TypedDict
89
from unittest import mock
@@ -185,11 +186,17 @@ def test_method_list(self, bound_model):
185186

186187
members_count = 0
187188
members_missing = []
188-
for name, member in inspect.getmembers(
189-
bound_model,
190-
lambda m: inspect.ismethod(m)
191-
and m.__func__ in bound_model.__class__.__dict__.values(),
192-
):
189+
190+
with warnings.catch_warnings():
191+
warnings.filterwarnings("ignore", category=DeprecationWarning)
192+
193+
members = inspect.getmembers(
194+
bound_model,
195+
lambda m: inspect.ismethod(m)
196+
and m.__func__ in bound_model.__class__.__dict__.values(),
197+
)
198+
199+
for name, member in members:
193200
# Ignore private methods
194201
if name.startswith("_"):
195202
continue

tests/unit/primary_ips/test_client.py

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,17 @@ def test_init(self, primary_ip_response):
4545
assert bound_primary_ip.assignee_id == 17
4646
assert bound_primary_ip.assignee_type == "server"
4747

48-
assert isinstance(bound_primary_ip.datacenter, BoundDatacenter)
49-
assert bound_primary_ip.datacenter.id == 42
50-
assert bound_primary_ip.datacenter.name == "fsn1-dc8"
51-
assert bound_primary_ip.datacenter.description == "Falkenstein DC Park 8"
52-
assert bound_primary_ip.datacenter.location.country == "DE"
53-
assert bound_primary_ip.datacenter.location.city == "Falkenstein"
54-
assert bound_primary_ip.datacenter.location.latitude == 50.47612
55-
assert bound_primary_ip.datacenter.location.longitude == 12.370071
48+
with pytest.deprecated_call():
49+
datacenter = bound_primary_ip.datacenter
50+
51+
assert isinstance(datacenter, BoundDatacenter)
52+
assert datacenter.id == 42
53+
assert datacenter.name == "fsn1-dc8"
54+
assert datacenter.description == "Falkenstein DC Park 8"
55+
assert datacenter.location.country == "DE"
56+
assert datacenter.location.city == "Falkenstein"
57+
assert datacenter.location.latitude == 50.47612
58+
assert datacenter.location.longitude == 12.370071
5659

5760

5861
class TestPrimaryIPsClient:
@@ -132,9 +135,12 @@ def test_create_with_datacenter(
132135
):
133136
request_mock.return_value = primary_ip_response
134137

135-
response = primary_ips_client.create(
136-
type="ipv6", name="my-resource", datacenter=Datacenter(name="datacenter")
137-
)
138+
with pytest.deprecated_call():
139+
response = primary_ips_client.create(
140+
type="ipv6",
141+
name="my-resource",
142+
datacenter=Datacenter(name="datacenter"),
143+
)
138144

139145
request_mock.assert_called_with(
140146
method="POST",

tests/unit/servers/test_client.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,13 @@ def test_init(self, response_full_server):
100100
assert bound_server.public_net.floating_ips[0].id == 478
101101
assert bound_server.public_net.floating_ips[0].complete is False
102102

103-
assert isinstance(bound_server.datacenter, BoundDatacenter)
104-
assert (
105-
bound_server.datacenter._client == bound_server._client._parent.datacenters
106-
)
107-
assert bound_server.datacenter.id == 1
108-
assert bound_server.datacenter.complete is True
103+
with pytest.deprecated_call():
104+
datacenter = bound_server.datacenter
105+
106+
assert isinstance(datacenter, BoundDatacenter)
107+
assert datacenter._client == bound_server._client._parent.datacenters
108+
assert datacenter.id == 1
109+
assert datacenter.complete is True
109110

110111
assert isinstance(bound_server.server_type, BoundServerType)
111112
assert (
@@ -288,12 +289,13 @@ def test_create_with_datacenter(
288289
):
289290
request_mock.return_value = response_create_simple_server
290291

291-
response = servers_client.create(
292-
"my-server",
293-
server_type=ServerType(name="cx11"),
294-
image=Image(id=4711),
295-
datacenter=Datacenter(id=1),
296-
)
292+
with pytest.deprecated_call():
293+
response = servers_client.create(
294+
"my-server",
295+
server_type=ServerType(name="cx11"),
296+
image=Image(id=4711),
297+
datacenter=Datacenter(id=1),
298+
)
297299

298300
request_mock.assert_called_with(
299301
method="POST",

0 commit comments

Comments
 (0)