From 396d36f8667bb20fe3322b495271f1dd5d78262c Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sun, 13 Sep 2020 13:35:08 +0200 Subject: [PATCH] Use simple Mock instead of MagicMock --- .../collection/tests/reddit/client/tests.py | 6 +++--- .../collection/tests/twitter/builder/tests.py | 20 +++++++++---------- .../news/collection/tests/utils/tests.py | 14 ++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/newsreader/news/collection/tests/reddit/client/tests.py b/src/newsreader/news/collection/tests/reddit/client/tests.py index f2ee84d..4dcc10f 100644 --- a/src/newsreader/news/collection/tests/reddit/client/tests.py +++ b/src/newsreader/news/collection/tests/reddit/client/tests.py @@ -1,4 +1,4 @@ -from unittest.mock import MagicMock, patch +from unittest.mock import Mock, patch from uuid import uuid4 from django.test import TestCase @@ -31,7 +31,7 @@ class RedditClientTestCase(TestCase): def test_client_retrieves_single_rules(self): subreddit = SubredditFactory() - mock_stream = MagicMock(rule=subreddit) + mock_stream = Mock(rule=subreddit) self.mocked_read.return_value = (simple_mock, mock_stream) @@ -150,7 +150,7 @@ class RedditClientTestCase(TestCase): def test_client_catches_long_exception_text(self): subreddit = SubredditFactory() - mock_stream = MagicMock(rule=subreddit) + mock_stream = Mock(rule=subreddit) self.mocked_read.side_effect = StreamParseException(message=words(1000)) diff --git a/src/newsreader/news/collection/tests/twitter/builder/tests.py b/src/newsreader/news/collection/tests/twitter/builder/tests.py index 8e08869..eba3e65 100644 --- a/src/newsreader/news/collection/tests/twitter/builder/tests.py +++ b/src/newsreader/news/collection/tests/twitter/builder/tests.py @@ -1,5 +1,5 @@ from datetime import datetime -from unittest.mock import MagicMock +from unittest.mock import Mock from django.test import TestCase from django.utils.html import format_html @@ -32,7 +32,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder(simple_mock, mock_stream) as builder: builder.build() @@ -82,7 +82,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder(image_mock, mock_stream) as builder: builder.build() @@ -123,7 +123,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder(video_mock, mock_stream) as builder: builder.build() @@ -166,7 +166,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder(video_without_bitrate_mock, mock_stream) as builder: builder.build() @@ -188,7 +188,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder(gif_mock, mock_stream) as builder: builder.build() @@ -214,7 +214,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder(retweet_mock, mock_stream) as builder: builder.build() @@ -250,7 +250,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder(quoted_mock, mock_stream) as builder: builder.build() @@ -281,7 +281,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder([], mock_stream) as builder: builder.build() @@ -293,7 +293,7 @@ class TwitterBuilderTestCase(TestCase): builder = TwitterBuilder profile = TwitterProfileFactory(screen_name="RobertsSpaceInd") - mock_stream = MagicMock(rule=profile) + mock_stream = Mock(rule=profile) with builder(unsanitized_mock, mock_stream) as builder: builder.build() diff --git a/src/newsreader/news/collection/tests/utils/tests.py b/src/newsreader/news/collection/tests/utils/tests.py index 10013c3..e88d1bf 100644 --- a/src/newsreader/news/collection/tests/utils/tests.py +++ b/src/newsreader/news/collection/tests/utils/tests.py @@ -1,4 +1,4 @@ -from unittest.mock import MagicMock, patch +from unittest.mock import Mock, patch from django.test import TestCase @@ -19,7 +19,7 @@ from newsreader.news.collection.utils import fetch, post class HelperFunctionTestCase: def test_simple(self): - self.mocked_method.return_value = MagicMock(status_code=200, content="content") + self.mocked_method.return_value = Mock(status_code=200, content="content") url = "https://www.bbc.co.uk/news" response = self.method(url) @@ -27,7 +27,7 @@ class HelperFunctionTestCase: self.assertEquals(response.content, "content") def test_raises_not_found(self): - self.mocked_method.return_value = MagicMock(status_code=404) + self.mocked_method.return_value = Mock(status_code=404) url = "https://www.bbc.co.uk/news" @@ -35,7 +35,7 @@ class HelperFunctionTestCase: self.method(url) def test_raises_denied(self): - self.mocked_method.return_value = MagicMock(status_code=401) + self.mocked_method.return_value = Mock(status_code=401) url = "https://www.bbc.co.uk/news" @@ -43,7 +43,7 @@ class HelperFunctionTestCase: self.method(url) def test_raises_forbidden(self): - self.mocked_method.return_value = MagicMock(status_code=403) + self.mocked_method.return_value = Mock(status_code=403) url = "https://www.bbc.co.uk/news" @@ -51,7 +51,7 @@ class HelperFunctionTestCase: self.method(url) def test_raises_timed_out(self): - self.mocked_method.return_value = MagicMock(status_code=408) + self.mocked_method.return_value = Mock(status_code=408) url = "https://www.bbc.co.uk/news" @@ -99,7 +99,7 @@ class HelperFunctionTestCase: self.method(url) def test_raises_stream_error_on_too_many_requests(self): - self.mocked_method.return_value = MagicMock(status_code=429) + self.mocked_method.return_value = Mock(status_code=429) url = "https://www.bbc.co.uk/news"