Update pytest from 3.10.0 to 4.0.1

pyup-bot · renzon · commit 42eaf4d9985a · 2018-11-28T11:37:32.000-02:00
diff --git a/pythonpro/core/tests/test_view_edit_email.py b/pythonpro/core/tests/test_view_edit_email.py
@@ -10,6 +10,11 @@
 
 @pytest.fixture
 def resp(client: Client):
+    return _resp(client)
+
+
+def _resp(client: Client):
+    """Plain function to avoid _pytest.warning_types.RemovedInPytest4Warning: Fixture "resp" called directly."""
     return client.get(reverse('core:profile_email'), secure=True)
 
 
@@ -22,7 +27,7 @@ def user(django_user_model):
 @pytest.fixture
 def resp_with_user(user, client: Client):
     client.force_login(user)
-    return resp(client)
+    return _resp(client)
 
 
 def test_not_logged_user(resp):
diff --git a/pythonpro/core/tests/test_view_edit_name.py b/pythonpro/core/tests/test_view_edit_name.py
@@ -8,6 +8,11 @@
 
 @pytest.fixture
 def resp(client: Client):
+    return _resp(client)
+
+
+def _resp(client):
+    """Plain function to avoid _pytest.warning_types.RemovedInPytest4Warning: Fixture "resp" called directly."""
     return client.get(reverse('core:profile_name'), secure=True)
 
 
@@ -20,7 +25,7 @@ def user(django_user_model):
 @pytest.fixture
 def resp_with_user(user, client: Client):
     client.force_login(user)
-    return resp(client)
+    return _resp(client)
 
 
 def test_not_logged_user(resp):
diff --git a/pythonpro/core/tests/test_view_edit_password.py b/pythonpro/core/tests/test_view_edit_password.py
@@ -9,6 +9,11 @@
 
 @pytest.fixture
 def resp(client: Client):
+    return _resp(client)
+
+
+def _resp(client):
+    """Plain function to avoid _pytest.warning_types.RemovedInPytest4Warning: Fixture "resp" called directly."""
     return client.get(reverse('core:profile_password'), secure=True)
 
 
@@ -21,7 +26,7 @@ def user(django_user_model):
 @pytest.fixture
 def resp_with_user(user, client: Client):
     client.force_login(user)
-    return resp(client)
+    return _resp(client)
 
 
 def test_not_logged_user(resp):
diff --git a/pythonpro/core/tests/test_view_home.py b/pythonpro/core/tests/test_view_home.py
@@ -11,14 +11,19 @@
 
 @pytest.fixture
 def home_resp(client):
+    return _resp(client)
+
+
+def _resp(client):
+    """Plain function to avoid _pytest.warning_types.RemovedInPytest4Warning: Fixture "resp" called directly."""
     return client.get('/', secure=True)
 
 
 @pytest.fixture
 def home_resp_with_user(django_user_model, client: Client):
     user = mommy.make(django_user_model)
     client.force_login(user)
-    return home_resp(client)
+    return _resp(client)
 
 
 def test_home_status_code(home_resp):
@@ -78,7 +83,7 @@ def test_forum_tab_is_present(home_resp_with_user):
 @pytest.fixture
 def home_resp_open_subscriptions(settings, client):
     settings.SUBSCRIPTIONS_OPEN = True
-    return home_resp(client)
+    return _resp(client)
 
 
 def test_payment_link_is_present(home_resp_open_subscriptions):
@@ -91,7 +96,7 @@ def test_payment_link_is_present(home_resp_open_subscriptions):
 @pytest.fixture
 def home_resp_closed_subscriptions(settings, client):
     settings.SUBSCRIPTIONS_OPEN = False
-    return home_resp(client)
+    return _resp(client)
 
 
 def test_payment_link_is_not_present(home_resp_closed_subscriptions):
diff --git a/pythonpro/core/tests/test_view_profile.py b/pythonpro/core/tests/test_view_profile.py
@@ -8,6 +8,11 @@
 
 @pytest.fixture
 def resp(client: Client):
+    return _resp(client)
+
+
+def _resp(client):
+    """Plain function to avoid _pytest.warning_types.RemovedInPytest4Warning: Fixture "resp" called directly."""
     return client.get(reverse('core:profile'), secure=True)
 
 
@@ -20,7 +25,7 @@ def user(django_user_model):
 @pytest.fixture
 def resp_with_user(user, client: Client):
     client.force_login(user)
-    return resp(client)
+    return _resp(client)
 
 
 def test_profile_not_logged_user(resp):
diff --git a/pythonpro/discourse/tests/test_sso.py b/pythonpro/discourse/tests/test_sso.py
@@ -40,6 +40,10 @@ def client_with_user(client, logged_user):
 
 @pytest.fixture
 def response(client_with_user, payload, sig=None):
+    return _resp(client_with_user, payload, sig)
+
+
+def _resp(client_with_user, payload, sig=None):
     encoded_payload = base64.encodebytes(payload.encode('utf-8'))
     hmac_obj = hmac.new(settings.DISCOURSE_SSO_SECRET.encode('utf-8'), encoded_payload, digestmod=hashlib.sha256)
     sig = hmac_obj.hexdigest() if sig is None else sig
@@ -49,12 +53,12 @@ def response(client_with_user, payload, sig=None):
 
 @pytest.fixture
 def response_with_wrong_sig(client_with_user, payload):
-    return response(client_with_user, payload, 'wrong sinature')
+    return _resp(client_with_user, payload, 'wrong sinature')
 
 
 @pytest.fixture
 def response_without_nonce(client_with_user):
-    return response(client_with_user, '')
+    return _resp(client_with_user, '')
 
 
 def _extract_from_payload(response):
diff --git a/pythonpro/modules/tests/test_module_detail_view.py b/pythonpro/modules/tests/test_module_detail_view.py
@@ -80,6 +80,11 @@ def python_birds(modules):
 
 @pytest.fixture
 def resp_with_sections(client_with_user, sections, python_birds):
+    return _resp_with_sections(client_with_user, sections, python_birds)
+
+
+def _resp_with_sections(client_with_user, sections, python_birds):
+    """Plain function to avoid _pytest.warning_types.RemovedInPytest4Warning: Fixture "resp" called directly."""
     return client_with_user.get(reverse('modules:detail', kwargs={'slug': python_birds.slug}))
 
 
@@ -103,7 +108,7 @@ def chapters(sections):
 
 @pytest.fixture
 def resp_with_chapters(client_with_user, python_birds, sections, chapters):
-    return resp_with_sections(client_with_user, sections, python_birds)
+    return _resp_with_sections(client_with_user, sections, python_birds)
 
 
 def test_chapter_titles(resp_with_chapters, chapters):
diff --git a/pythonpro/modules/tests/test_module_index_view.py b/pythonpro/modules/tests/test_module_index_view.py
@@ -18,11 +18,15 @@ def modules(transactional_db):
 def resp(client, django_user_model, modules):
     user = mommy.make(django_user_model)
     client.force_login(user)
-    return resp_not_logged(client, modules)
+    return _resp_not_logged(client, modules)
 
 
 @pytest.fixture
 def resp_not_logged(client, modules):
+    return _resp_not_logged(client, modules)
+
+
+def _resp_not_logged(client, modules):
     return client.get(reverse('modules:index'))
 
 
