From 6c5953e8c2070ad960f2689a60922ae6311b0638 Mon Sep 17 00:00:00 2001 From: Johannes Keyser Date: Thu, 27 Apr 2017 02:28:54 +0200 Subject: [PATCH] utils: Fix test case failures due to caching (Closes: #813) Reviewed-by: Sunil Mohan Adapa --- plinth/tests/test_context_processors.py | 4 +++- plinth/tests/test_middleware.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plinth/tests/test_context_processors.py b/plinth/tests/test_context_processors.py index b1b25391b..819923d5b 100644 --- a/plinth/tests/test_context_processors.py +++ b/plinth/tests/test_context_processors.py @@ -18,7 +18,7 @@ """ Test module for Plinth's custom context processors. """ -from unittest.mock import Mock +from unittest.mock import Mock, MagicMock from django.http import HttpRequest from django.test import TestCase @@ -38,6 +38,7 @@ class ContextProcessorsTestCase(TestCase): request.path = '/aaa/bbb/ccc/' request.user = Mock() request.user.groups.filter().exists = Mock(return_value=True) + request.session = MagicMock() response = cp.common(request) self.assertIsNotNone(response) @@ -65,6 +66,7 @@ class ContextProcessorsTestCase(TestCase): request.path = '' request.user = Mock() request.user.groups.filter().exists = Mock(return_value=True) + request.session = MagicMock() response = cp.common(request) self.assertEqual([], response['active_menu_urls']) diff --git a/plinth/tests/test_middleware.py b/plinth/tests/test_middleware.py index b9440c93f..340fb746a 100644 --- a/plinth/tests/test_middleware.py +++ b/plinth/tests/test_middleware.py @@ -19,7 +19,7 @@ Test module for Plinth's custom middleware. """ -from unittest.mock import Mock, patch +from unittest.mock import Mock, MagicMock, patch from django.contrib.auth.models import AnonymousUser, User from django.core.exceptions import PermissionDenied @@ -162,14 +162,14 @@ class TestAdminMiddleware(TestCase): def test_that_admin_view_is_denied_for_usual_user(self): """Test that normal user is denied for an admin view""" self.request.user.groups.filter().exists = Mock(return_value=False) - + self.request.session = MagicMock() self.assertRaises(PermissionDenied, self.middleware.process_view, self.request, **self.kwargs) def test_that_admin_view_is_allowed_for_admin_user(self): """Test that admin user is allowed for an admin view""" self.request.user.groups.filter().exists = Mock(return_value=True) - + self.request.session = MagicMock() response = self.middleware.process_view(self.request, **self.kwargs) self.assertIsNone(response)