Skip to content

Commit d910f89

Browse files
committed
Address Copilot remarks
1 parent 9e68fea commit d910f89

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

test/integration/conftest.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
from requests.exceptions import ConnectionError, RequestException
1717

1818
from linode_api4 import (
19+
Instance,
1920
InterfaceGeneration,
21+
IPAddress,
2022
LinodeInterfaceDefaultRouteOptions,
2123
LinodeInterfaceOptions,
2224
LinodeInterfacePublicOptions,
@@ -761,14 +763,15 @@ def create_reserved_ip_assigned(test_linode_client, create_linode):
761763
region=linode.region,
762764
)
763765

766+
linode = client.load(Instance, linode.id)
764767
reserved_ip = test_linode_client.load(
765768
ReservedIPAddress, reserved_ip.address
766769
)
767770

768771
yield linode, reserved_ip
769772

770-
# Delete only if IP exists (some tests delete it earlier)
771-
if client.networking.reserved_ips(
772-
ReservedIPAddress.address == reserved_ip.address
773+
# Delete assigned IP address completely
774+
if address := client.networking.ips(
775+
IPAddress.address == reserved_ip.address
773776
):
774-
reserved_ip.delete()
777+
address[0].delete()

test/integration/models/networking/test_networking.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,12 @@ def test_create_reserved_ip_with_allocate(
514514
reserved_ip = client.load(ReservedIPAddress, reserved_ip.address)
515515
reserved_ip.delete()
516516

517+
# Delete assigned IP address completely
518+
if address := client.networking.ips(
519+
IPAddress.address == reserved_ip.address
520+
):
521+
address[0].delete()
522+
517523

518524
def test_reserve_ephemeral_ip(test_linode_client, create_linode):
519525
client = test_linode_client

test/integration/models/nodebalancer/test_nodebalancer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ def test_create_nb_with_reserved_ip(
129129
ipv4=reserved_ip.address,
130130
)
131131

132-
assert TEST_REGION, nb.region
133132
assert label == nb.label
134133
assert nb.ipv4.address == reserved_ip.address
135134
assert nb.ipv4.public == True

test/integration/models/tag/test_tag.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_get_tag_with_reserved_ip(
4545
tag, reserved_ip = create_tag_with_reserved_ip
4646
tag = test_linode_client.load(Tag, tag.id).objects[0]
4747

48-
assert vars(tag).keys() == vars(reserved_ip).keys()
48+
assert isinstance(tag, ReservedIPAddress)
4949
assert tag.address == reserved_ip.address
5050
assert tag.reserved == reserved_ip.reserved
5151
assert tag.tags == reserved_ip.tags

0 commit comments

Comments
 (0)