External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 11:41:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix up deprecation warning about get_response for middleware

Browse Source 
It will no longer be allowed to be None by Django 4.0
This commit is contained in:
Jeff Bradberry
2022-02-07 10:59:52 -05:00
parent 1e625ed58b
commit 0500512c3c
4 changed files with 12 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
awx/main/tests/functional/test_session.py
View File

@@ -1,16 +1,12 @@
from importlib import import_module
import pytest
import re
from django.conf import settings
from django.test.utils import override_settings
from django.contrib.sessions.middleware import SessionMiddleware
from django.contrib.sessions.models import Session
from django.contrib.auth import SESSION_KEY
from unittest import mock
from awx.api.versioning import reverse
class AlwaysPassBackend(object):
@@ -30,26 +26,6 @@ def test_login_json_not_allowed(get, accept, status):
get('/api/login/', HTTP_ACCEPT=accept, expect=status)
@pytest.mark.skip(reason="Needs Update - CA")
@pytest.mark.django_db
def test_session_create_delete(admin, post, get):
AlwaysPassBackend.user = admin
with override_settings(AUTHENTICATION_BACKENDS=(AlwaysPassBackend.get_backend_path(),), SESSION_COOKIE_NAME='session_id'):
response = post(
'/api/login/',
data={'username': admin.username, 'password': admin.password, 'next': '/api/'},
expect=302,
middleware=SessionMiddleware(),
format='multipart',
)
assert 'session_id' in response.cookies
session_key = re.findall(r'session_id=[a-zA-z0-9]+', str(response.cookies['session_id']))[0][len('session_id=') :]
session = Session.objects.get(session_key=session_key)
assert int(session.get_decoded()[SESSION_KEY]) == admin.pk
response = get('/api/logout/', middleware=SessionMiddleware(), cookies={'session_id': session_key}, expect=302)
assert not Session.objects.filter(session_key=session_key).exists()
@pytest.mark.django_db
@mock.patch('awx.main.consumers.emit_channel_notification')
def test_sessions_unlimited(emit, admin):
@@ -81,21 +57,3 @@ def test_session_overlimit(emit, admin, alice):
store = import_module(settings.SESSION_ENGINE).SessionStore()
store.create_model_instance({SESSION_KEY: alice.pk}).save()
assert Session.objects.count() == 4
@pytest.mark.skip(reason="Needs Update - CA")
@pytest.mark.django_db
def test_password_update_clears_sessions(admin, alice, post, patch):
AlwaysPassBackend.user = alice
with override_settings(AUTHENTICATION_BACKENDS=(AlwaysPassBackend.get_backend_path(),), SESSION_COOKIE_NAME='session_id'):
response = post(
'/api/login/',
data={'username': alice.username, 'password': alice.password, 'next': '/api/'},
expect=302,
middleware=SessionMiddleware(),
format='multipart',
)
session_key = re.findall(r'session_id=[a-zA-z0-9]+', str(response.cookies['session_id']))[0][len('session_id=') :]
assert Session.objects.filter(session_key=session_key).exists()
patch(reverse('api:user_detail', kwargs={'pk': alice.pk}), admin, data={'password': 'new_password'}, expect=200)
assert not Session.objects.filter(session_key=session_key).exists()