From 04eac793d67e52d483d6f00edbb91b2219191c5d Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 30 Nov 2019 16:07:55 +0100 Subject: [PATCH] import helper directly this way I don't have to clean unused helper imports --- .../tests/test_views/test_backup_detail_view.py | 5 +++-- .../tests/test_views/test_computer_detail_view.py | 8 ++++---- .../tests/test_views/test_computer_list_view.py | 5 +++-- .../test_views/test_customer_backup_table_view.py | 5 +++-- .../test_customer_computer_table_view.py | 8 +++++--- .../tests/test_views/test_customer_detail_view.py | 4 ++-- .../tests/test_views/test_customer_list_view.py | 4 ++-- .../tests/test_views/test_device_detail_view.py | 5 +++-- .../tests/test_views/test_net_detail_view.py | 15 ++++++++------- 9 files changed, 33 insertions(+), 26 deletions(-) diff --git a/network_inventory/inventory/tests/test_views/test_backup_detail_view.py b/network_inventory/inventory/tests/test_views/test_backup_detail_view.py index 764b4eb..0dbb7a5 100644 --- a/network_inventory/inventory/tests/test_views/test_backup_detail_view.py +++ b/network_inventory/inventory/tests/test_views/test_backup_detail_view.py @@ -2,7 +2,7 @@ import pytest from mixer.backend.django import mixer from django.test import Client -from helper import in_content, not_in_content +import helper pytestmark=pytest.mark.django_db @@ -19,7 +19,8 @@ def test_backup_detail_view(create_admin_user): client = Client() client.login(username="novartis-admin", password="password") response = client.get('/backup/' + str(backup.id) + '/') - assert response.status_code == 200 and in_content(response, backup.name) + assert (response.status_code == 200 + and helper.in_content(response, backup.name)) def test_backup_detail_view_not_found(create_admin_user): diff --git a/network_inventory/inventory/tests/test_views/test_computer_detail_view.py b/network_inventory/inventory/tests/test_views/test_computer_detail_view.py index ddbc480..2153d3c 100644 --- a/network_inventory/inventory/tests/test_views/test_computer_detail_view.py +++ b/network_inventory/inventory/tests/test_views/test_computer_detail_view.py @@ -4,7 +4,7 @@ from mixer.backend.django import mixer from django.test import Client from django.contrib.auth import get_user_model -from helper import in_content, not_in_content +import helper pytestmark=pytest.mark.django_db @@ -29,13 +29,13 @@ def test_customer_detail_view(create_admin_user): client.login(username="novartis-admin", password="password") response = client.get('/customer/' + str(customer.id) + '/') assert (response.status_code == 200 - and in_content(response, customer.name)) + and helper.in_content(response, customer.name)) def test_customer_detail_view_no_permissions(): User = get_user_model() - admin = User.objects.create_user("novartis-admin", "admin@novartis.com", - "password", is_staff=True) + User.objects.create_user("novartis-admin", "admin@novartis.com", + "password", is_staff=True) client = Client() customer = mixer.blend('inventory.Customer') client.login(username="novartis-admin", password="password") diff --git a/network_inventory/inventory/tests/test_views/test_computer_list_view.py b/network_inventory/inventory/tests/test_views/test_computer_list_view.py index 3636b6a..10acea6 100644 --- a/network_inventory/inventory/tests/test_views/test_computer_list_view.py +++ b/network_inventory/inventory/tests/test_views/test_computer_list_view.py @@ -3,7 +3,7 @@ from mixer.backend.django import mixer from django.test import Client -from helper import in_content, not_in_content +import helper pytestmark=pytest.mark.django_db @@ -28,4 +28,5 @@ def test_computer_list_view(create_admin_user): client = Client() client.login(username="novartis-admin", password="password") response = client.get('/computers/all/') - assert response.status_code == 200 and in_content(response, computer.name) + assert (response.status_code == 200 + and helper.in_content(response, computer.name)) diff --git a/network_inventory/inventory/tests/test_views/test_customer_backup_table_view.py b/network_inventory/inventory/tests/test_views/test_customer_backup_table_view.py index 68574a2..16499ac 100644 --- a/network_inventory/inventory/tests/test_views/test_customer_backup_table_view.py +++ b/network_inventory/inventory/tests/test_views/test_customer_backup_table_view.py @@ -3,7 +3,7 @@ from mixer.backend.django import mixer from django.test import Client -from helper import in_content +import helper from inventory.models import Customer @@ -23,7 +23,8 @@ def test_customer_backup_table(create_admin_user): computer = mixer.blend('inventory.Computer', customer=customer) backup = mixer.blend('inventory.Backup', computer=computer) response = client.get('/customer/' + str(customer.id) + '/backups/') - assert response.status_code == 200 and in_content(response, backup.name) + assert (response.status_code == 200 + and helper.in_content(response, backup.name)) def test_customer_backup_table_no_backup(create_admin_user): diff --git a/network_inventory/inventory/tests/test_views/test_customer_computer_table_view.py b/network_inventory/inventory/tests/test_views/test_customer_computer_table_view.py index bdfdadb..5d3b30e 100644 --- a/network_inventory/inventory/tests/test_views/test_customer_computer_table_view.py +++ b/network_inventory/inventory/tests/test_views/test_customer_computer_table_view.py @@ -3,7 +3,7 @@ from mixer.backend.django import mixer from django.test import Client -from helper import in_content, not_in_content +import helper pytestmark=pytest.mark.django_db @@ -19,7 +19,8 @@ def test_customer_computer_table(create_admin_user): client.login(username="novartis-admin", password="password") computer = mixer.blend('inventory.Computer', customer=mixer.SELECT) response = client.get('/customer/' + str(customer.id) + '/computers/') - assert response.status_code == 200 and in_content(response, computer.name) + assert (response.status_code == 200 + and helper.in_content(response, computer.name)) def test_customer_computer_table_no_computer(create_admin_user): @@ -28,4 +29,5 @@ def test_customer_computer_table_no_computer(create_admin_user): client = Client() client.login(username="novartis-admin", password="password") response = client.get('/customer/' + str(customer.id) + '/computers/') - assert response.status_code == 200 and not_in_content(response, "Novartis PC") + assert (response.status_code == 200 + and helper.not_in_content(response, "Novartis PC")) diff --git a/network_inventory/inventory/tests/test_views/test_customer_detail_view.py b/network_inventory/inventory/tests/test_views/test_customer_detail_view.py index ddbc480..ab366e4 100644 --- a/network_inventory/inventory/tests/test_views/test_customer_detail_view.py +++ b/network_inventory/inventory/tests/test_views/test_customer_detail_view.py @@ -4,7 +4,7 @@ from mixer.backend.django import mixer from django.test import Client from django.contrib.auth import get_user_model -from helper import in_content, not_in_content +import helper pytestmark=pytest.mark.django_db @@ -29,7 +29,7 @@ def test_customer_detail_view(create_admin_user): client.login(username="novartis-admin", password="password") response = client.get('/customer/' + str(customer.id) + '/') assert (response.status_code == 200 - and in_content(response, customer.name)) + and helper.in_content(response, customer.name)) def test_customer_detail_view_no_permissions(): diff --git a/network_inventory/inventory/tests/test_views/test_customer_list_view.py b/network_inventory/inventory/tests/test_views/test_customer_list_view.py index 74f5f73..996e066 100644 --- a/network_inventory/inventory/tests/test_views/test_customer_list_view.py +++ b/network_inventory/inventory/tests/test_views/test_customer_list_view.py @@ -4,7 +4,7 @@ from mixer.backend.django import mixer from django.test import Client from django.contrib.auth import get_user_model -from helper import in_content, not_in_content +import helper pytestmark=pytest.mark.django_db @@ -31,4 +31,4 @@ def test_customer_list_view(create_admin_user): client.login(username="novartis-admin", password="password") response = client.get('/') assert (response.status_code == 200 - and in_content(response, customer.name)) + and helper.in_content(response, customer.name)) diff --git a/network_inventory/inventory/tests/test_views/test_device_detail_view.py b/network_inventory/inventory/tests/test_views/test_device_detail_view.py index bb029ce..52435c0 100644 --- a/network_inventory/inventory/tests/test_views/test_device_detail_view.py +++ b/network_inventory/inventory/tests/test_views/test_device_detail_view.py @@ -3,7 +3,7 @@ from mixer.backend.django import mixer from django.test import Client -from helper import in_content, not_in_content +import helper pytestmark=pytest.mark.django_db @@ -19,7 +19,8 @@ def test_device_detail_view(create_admin_user): client = Client() client.login(username="novartis-admin", password="password") response = client.get('/device/' + str(device.id) + '/') - assert response.status_code == 200 and in_content(response, device.name) + assert (response.status_code == 200 + and helper.in_content(response, device.name)) def test_device_detail_view_not_found(create_admin_user): diff --git a/network_inventory/inventory/tests/test_views/test_net_detail_view.py b/network_inventory/inventory/tests/test_views/test_net_detail_view.py index 9324ceb..7bcf402 100644 --- a/network_inventory/inventory/tests/test_views/test_net_detail_view.py +++ b/network_inventory/inventory/tests/test_views/test_net_detail_view.py @@ -6,7 +6,7 @@ from django.contrib.auth import get_user_model from inventory.models import DeviceInNet -from helper import in_content, not_in_content +import helper pytestmark=pytest.mark.django_db @@ -19,26 +19,27 @@ def test_net_detail_view_no_permission(create_admin_user): client.login(username="novartis-admin", password="password") response = client.get('/net/' + str(net.id) + '/') assert (response.status_code == 200 - and in_content(response, net.name) - and not_in_content(response, device_in_net.ip)) + and helper.in_content(response, net.name) + and helper.not_in_content(response, device_in_net.ip)) def test_net_detail_view(create_admin_user): fixture = create_admin_user() net = mixer.blend('inventory.Net') device = mixer.blend('inventory.Computer', customer=fixture['customer']) - device_in_net = DeviceInNet.objects.create(device=device, net=net, ip='10.7.89.101') + device_in_net = DeviceInNet.objects.create(device=device, + net=net, ip='10.7.89.101') client = Client() client.login(username="novartis-admin", password="password") response = client.get('/net/' + str(net.id) + '/') assert (response.status_code == 200 - and in_content(response, net.name) - and in_content(response, device_in_net.ip)) + and helper.in_content(response, net.name) + and helper.in_content(response, device_in_net.ip)) def test_net_detail_view_not_found(create_admin_user): create_admin_user() - net = mixer.blend('inventory.Net') + mixer.blend('inventory.Net') client = Client() client.login(username="novartis-admin", password="password") response = client.get('/net/100/')