From d2ce002305ccbdf29275d37ccbcb1d4130068439 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 8 Nov 2016 15:25:38 +0100 Subject: [PATCH] Fix further problems with py.test --- src/tests/control/test_auth.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/tests/control/test_auth.py b/src/tests/control/test_auth.py index 5f61644c0..c806d78e8 100644 --- a/src/tests/control/test_auth.py +++ b/src/tests/control/test_auth.py @@ -1,7 +1,7 @@ import time from datetime import date, timedelta -from _pytest import monkeypatch +import pytest from django.conf import settings from django.contrib.auth.tokens import ( PasswordResetTokenGenerator, default_token_generator, @@ -189,6 +189,12 @@ class RegistrationFormTest(TestCase): self.assertEqual(response.status_code, 302) +@pytest.fixture +def class_monkeypatch(request, monkeypatch): + request.cls.monkeypatch = monkeypatch + + +@pytest.mark.usefixtures("class_monkeypatch") class Login2FAFormTest(TestCase): def setUp(self): @@ -244,7 +250,7 @@ class Login2FAFormTest(TestCase): def fail(*args, **kwargs): raise Exception("Failed") - m = monkeypatch.monkeypatch() + m = self.monkeypatch m.setattr("u2flib_server.u2f.verify_authenticate", fail) m.setattr("u2flib_server.u2f.start_authenticate", lambda *args, **kwargs: JSONDict({'authenticateRequests': []})) @@ -261,7 +267,7 @@ class Login2FAFormTest(TestCase): m.undo() def test_u2f_valid(self): - m = monkeypatch.monkeypatch() + m = self.monkeypatch m.setattr("u2flib_server.u2f.verify_authenticate", lambda *args, **kwargs: True) m.setattr("u2flib_server.u2f.start_authenticate", lambda *args, **kwargs: JSONDict({'authenticateRequests': []}))