From 59a9fd5bb495ddc718dd0f7712a8b50dab9487a3 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Mon, 15 Feb 2021 00:45:31 +0000 Subject: [PATCH] Oops --- RIGS/tests/test_interaction.py | 4 ++-- conftest.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/RIGS/tests/test_interaction.py b/RIGS/tests/test_interaction.py index 6e0db86d..5d740b34 100644 --- a/RIGS/tests/test_interaction.py +++ b/RIGS/tests/test_interaction.py @@ -748,8 +748,8 @@ def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist assert vehicle_name == vehicle.vehicle -#FIXME -@pytest.mark.xfail +# FIXME +@pytest.mark.xfail(run=False) def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist): page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open() page.add_crew() diff --git a/conftest.py b/conftest.py index 48f3c8fd..3e5b278a 100644 --- a/conftest.py +++ b/conftest.py @@ -23,12 +23,12 @@ def pytest_configure(): django.setup() -@pytest.fixture # Overrides the one from pytest-django +@pytest.fixture # Overrides the one from pytest-django def admin_user(admin_user): - admin_user.username="EventTest" - admin_user.first_name="Event" - admin_user.last_name="Test" - admin_user.initials="ETU" + admin_user.username = "EventTest" + admin_user.first_name = "Event" + admin_user.last_name = "Test" + admin_user.initials = "ETU" admin_user.save() return admin_user