Skip to content

serverdb: Use native ipaddress module in test_views #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brainexe merged 1 commit into from
Jun 10, 2026
Merged

serverdb: Use native ipaddress module in test_views #446

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions serveradmin/serverdb/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from ipaddress import ip_address

from django.contrib.auth.models import User
from django.test import TransactionTestCase
from netaddr import IPAddress

from serveradmin.dataset import Query
from serveradmin.serverdb.models import Change
Expand All @@ -19,7 +20,7 @@ def test_change_id_does_not_exist(self):
def test_recreate_succeeds(self):
vm = Query().new_object('vm')
vm['hostname'] = 'test-serverdb-recreate'
vm['intern_ip'] = IPAddress('10.0.0.1')
vm['intern_ip'] = ip_address('10.0.0.1')
vm.commit(user=User.objects.first())

vm = Query({'hostname': 'test-serverdb-recreate'})
Expand All @@ -41,7 +42,7 @@ def test_recreate_succeeds(self):
def test_recreate_fails_if_hostname_exists(self):
vm = Query().new_object('vm')
vm['hostname'] = 'test-serverdb-recreate'
vm['intern_ip'] = IPAddress('10.0.0.1')
vm['intern_ip'] = ip_address('10.0.0.1')
vm.commit(user=User.objects.first())

vm = Query({'hostname': 'test-serverdb-recreate'})
Expand All @@ -51,7 +52,7 @@ def test_recreate_fails_if_hostname_exists(self):

vm = Query().new_object('vm')
vm['hostname'] = 'test-serverdb-recreate'
vm['intern_ip'] = IPAddress('10.0.0.2')
vm['intern_ip'] = ip_address('10.0.0.2')
vm.commit(user=User.objects.first())

change_id = Change.objects.filter(
Expand Down
Loading