Skip to content

Commit

Permalink
Merge pull request #194 from elnappo/master
Browse files Browse the repository at this point in the history 
add some tests
  • Loading branch information
@ThomasWaldmann
ThomasWaldmann committed Jan 2, 2015
2 parents d6949e5 + a0c0ba4 commit 8e55167
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 1 deletion.
3 changes: 2 additions & 1 deletion conftest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ def db_init(db): # note: db is a predefined fixture and required here to have t

RelatedHost.objects.create(name=RELATED_HOST_NAME,
interface_id_ipv4="0.0.0.1", interface_id_ipv6="::1", main_host=h)

RelatedHost.objects.create(name=RELATED_HOST_NAME,
interface_id_ipv4="0.0.0.1", interface_id_ipv6="::1", main_host=h2)

def pytest_runtest_setup(item):
activate('en')
10 changes: 10 additions & 0 deletions nsupdate/accounts/_tests/test_accounts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ def test_views_anon(client):
for view, kwargs, status_code in [
# stuff that requires being logged-in redirects to the login view:
('account_profile', dict(), 302),
('account_settings', dict(), 302),
('account_delete', dict(), 302),
('registration_disallowed', dict(), 200),
('registration_complete', dict(), 200),
('registration_register', dict(), 200),
('registration_activation_complete', dict(), 200),
]:
print("%s, %s, %s" % (view, kwargs, status_code))
response = client.get(reverse(view, kwargs=kwargs))
Expand All @@ -28,7 +33,12 @@ def test_views_logged_in(client):
client.login(username=USERNAME, password=PASSWORD)
for view, kwargs, status_code in [
('account_profile', dict(), 200),
('account_settings', dict(), 200),
('account_delete', dict(), 200),
('registration_disallowed', dict(), 200),
('registration_complete', dict(), 200),
('registration_register', dict(), 200),
('registration_activation_complete', dict(), 200),
]:
print("%s, %s, %s" % (view, kwargs, status_code))
response = client.get(reverse(view, kwargs=kwargs))
Expand Down
40 changes: 40 additions & 0 deletions nsupdate/main/_tests/test_main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,23 @@ def test_views_anon(client):
('generate_secret_view', dict(pk=1), 302),
('generate_ns_secret_view', dict(pk=1), 302),
('host_view', dict(pk=1), 302),
('host_view', dict(pk=2), 302),
('host_view', dict(pk=100), 302),
('add_host', dict(), 302),
('delete_host', dict(pk=1), 302),
('related_host_overview', dict(mpk=1), 302),
('related_host_overview', dict(mpk=100), 302),
('related_host_view', dict(mpk=1, pk=1), 302),
('add_related_host', dict(mpk=1), 302),
('add_related_host', dict(mpk=2), 302),
('add_related_host', dict(mpk=100), 302),
('delete_related_host', dict(mpk=1, pk=1), 302),
('domain_view', dict(pk=1), 302),
('domain_view', dict(pk=2), 302),
('domain_view', dict(pk=100), 302),
('add_domain', dict(), 302),
('delete_domain', dict(pk=1), 302),
('delete_domain', dict(pk=2), 302),
('updater_hostconfig_overview', dict(pk=1), 302),
('updater_hostconfig', dict(pk=1), 302),
('delete_updater_hostconfig', dict(pk=1), 302),
Expand All @@ -52,19 +61,50 @@ def test_views_logged_in(client):
('status', dict(), 200),
('overview', dict(), 200),
('generate_secret_view', dict(pk=1), 200),
('generate_secret_view', dict(pk=2), 404),
('generate_secret_view', dict(pk=100), 404),
('generate_ns_secret_view', dict(pk=1), 200),
('generate_ns_secret_view', dict(pk=2), 404),
('generate_ns_secret_view', dict(pk=100), 404),
('host_view', dict(pk=1), 200),
('host_view', dict(pk=2), 404),
('host_view', dict(pk=100), 404),
('add_host', dict(), 200),
('delete_host', dict(pk=1), 200),
('delete_host', dict(pk=2), 404),
('delete_host', dict(pk=100), 404),
('related_host_overview', dict(mpk=1), 200),
('related_host_overview', dict(mpk=2), 404),
('related_host_overview', dict(mpk=100), 404),
('related_host_view', dict(mpk=1, pk=1), 200),
('related_host_view', dict(mpk=2, pk=1), 404),
('related_host_view', dict(mpk=100, pk=1), 404),
('related_host_view', dict(mpk=1, pk=2), 404),
('related_host_view', dict(mpk=1, pk=100), 404),
('add_related_host', dict(mpk=1), 200),
('add_related_host', dict(mpk=2), 404),
('add_related_host', dict(mpk=100), 404),
('delete_related_host', dict(mpk=1, pk=1), 200),
('delete_related_host', dict(mpk=2, pk=1), 404),
('delete_related_host', dict(mpk=100, pk=1), 404),
('delete_related_host', dict(mpk=1, pk=2), 404),
('delete_related_host', dict(mpk=1, pk=100), 404),
('domain_view', dict(pk=1), 200),
('domain_view', dict(pk=2), 404),
('domain_view', dict(pk=100), 404),
('add_domain', dict(), 200),
('delete_domain', dict(pk=1), 200),
('delete_domain', dict(pk=2), 404),
('delete_domain', dict(pk=100), 404),
('updater_hostconfig_overview', dict(pk=1), 200),
('updater_hostconfig_overview', dict(pk=2), 404),
('updater_hostconfig_overview', dict(pk=100), 404),
('updater_hostconfig', dict(pk=1), 200),
('updater_hostconfig', dict(pk=2), 404),
('updater_hostconfig', dict(pk=100), 404),
('delete_updater_hostconfig', dict(pk=1), 200),
('delete_updater_hostconfig', dict(pk=2), 404),
('delete_updater_hostconfig', dict(pk=100), 404),
('update', dict(), 401),
]:
print("%s, %s, %s" % (view, kwargs, status_code))
Expand Down

0 comments on commit 8e55167

Please sign in to comment.