Use simple Mock instead of MagicMock
This commit is contained in:
parent
150c492628
commit
396d36f866
3 changed files with 20 additions and 20 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import Mock, patch
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
@ -31,7 +31,7 @@ class RedditClientTestCase(TestCase):
|
||||||
|
|
||||||
def test_client_retrieves_single_rules(self):
|
def test_client_retrieves_single_rules(self):
|
||||||
subreddit = SubredditFactory()
|
subreddit = SubredditFactory()
|
||||||
mock_stream = MagicMock(rule=subreddit)
|
mock_stream = Mock(rule=subreddit)
|
||||||
|
|
||||||
self.mocked_read.return_value = (simple_mock, mock_stream)
|
self.mocked_read.return_value = (simple_mock, mock_stream)
|
||||||
|
|
||||||
|
|
@ -150,7 +150,7 @@ class RedditClientTestCase(TestCase):
|
||||||
|
|
||||||
def test_client_catches_long_exception_text(self):
|
def test_client_catches_long_exception_text(self):
|
||||||
subreddit = SubredditFactory()
|
subreddit = SubredditFactory()
|
||||||
mock_stream = MagicMock(rule=subreddit)
|
mock_stream = Mock(rule=subreddit)
|
||||||
|
|
||||||
self.mocked_read.side_effect = StreamParseException(message=words(1000))
|
self.mocked_read.side_effect = StreamParseException(message=words(1000))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from unittest.mock import MagicMock
|
from unittest.mock import Mock
|
||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
from django.utils.html import format_html
|
from django.utils.html import format_html
|
||||||
|
|
@ -32,7 +32,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
||||||
mock_stream = MagicMock(rule=profile)
|
mock_stream = Mock(rule=profile)
|
||||||
|
|
||||||
with builder(simple_mock, mock_stream) as builder:
|
with builder(simple_mock, mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
@ -82,7 +82,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
||||||
mock_stream = MagicMock(rule=profile)
|
mock_stream = Mock(rule=profile)
|
||||||
|
|
||||||
with builder(image_mock, mock_stream) as builder:
|
with builder(image_mock, mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
@ -123,7 +123,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
||||||
mock_stream = MagicMock(rule=profile)
|
mock_stream = Mock(rule=profile)
|
||||||
|
|
||||||
with builder(video_mock, mock_stream) as builder:
|
with builder(video_mock, mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
@ -166,7 +166,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
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:
|
with builder(video_without_bitrate_mock, mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
@ -188,7 +188,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
||||||
mock_stream = MagicMock(rule=profile)
|
mock_stream = Mock(rule=profile)
|
||||||
|
|
||||||
with builder(gif_mock, mock_stream) as builder:
|
with builder(gif_mock, mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
@ -214,7 +214,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
||||||
mock_stream = MagicMock(rule=profile)
|
mock_stream = Mock(rule=profile)
|
||||||
|
|
||||||
with builder(retweet_mock, mock_stream) as builder:
|
with builder(retweet_mock, mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
@ -250,7 +250,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
||||||
mock_stream = MagicMock(rule=profile)
|
mock_stream = Mock(rule=profile)
|
||||||
|
|
||||||
with builder(quoted_mock, mock_stream) as builder:
|
with builder(quoted_mock, mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
@ -281,7 +281,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
||||||
mock_stream = MagicMock(rule=profile)
|
mock_stream = Mock(rule=profile)
|
||||||
|
|
||||||
with builder([], mock_stream) as builder:
|
with builder([], mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
@ -293,7 +293,7 @@ class TwitterBuilderTestCase(TestCase):
|
||||||
builder = TwitterBuilder
|
builder = TwitterBuilder
|
||||||
|
|
||||||
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
profile = TwitterProfileFactory(screen_name="RobertsSpaceInd")
|
||||||
mock_stream = MagicMock(rule=profile)
|
mock_stream = Mock(rule=profile)
|
||||||
|
|
||||||
with builder(unsanitized_mock, mock_stream) as builder:
|
with builder(unsanitized_mock, mock_stream) as builder:
|
||||||
builder.build()
|
builder.build()
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from unittest.mock import MagicMock, patch
|
from unittest.mock import Mock, patch
|
||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
|
|
@ -19,7 +19,7 @@ from newsreader.news.collection.utils import fetch, post
|
||||||
|
|
||||||
class HelperFunctionTestCase:
|
class HelperFunctionTestCase:
|
||||||
def test_simple(self):
|
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"
|
url = "https://www.bbc.co.uk/news"
|
||||||
response = self.method(url)
|
response = self.method(url)
|
||||||
|
|
@ -27,7 +27,7 @@ class HelperFunctionTestCase:
|
||||||
self.assertEquals(response.content, "content")
|
self.assertEquals(response.content, "content")
|
||||||
|
|
||||||
def test_raises_not_found(self):
|
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"
|
url = "https://www.bbc.co.uk/news"
|
||||||
|
|
||||||
|
|
@ -35,7 +35,7 @@ class HelperFunctionTestCase:
|
||||||
self.method(url)
|
self.method(url)
|
||||||
|
|
||||||
def test_raises_denied(self):
|
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"
|
url = "https://www.bbc.co.uk/news"
|
||||||
|
|
||||||
|
|
@ -43,7 +43,7 @@ class HelperFunctionTestCase:
|
||||||
self.method(url)
|
self.method(url)
|
||||||
|
|
||||||
def test_raises_forbidden(self):
|
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"
|
url = "https://www.bbc.co.uk/news"
|
||||||
|
|
||||||
|
|
@ -51,7 +51,7 @@ class HelperFunctionTestCase:
|
||||||
self.method(url)
|
self.method(url)
|
||||||
|
|
||||||
def test_raises_timed_out(self):
|
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"
|
url = "https://www.bbc.co.uk/news"
|
||||||
|
|
||||||
|
|
@ -99,7 +99,7 @@ class HelperFunctionTestCase:
|
||||||
self.method(url)
|
self.method(url)
|
||||||
|
|
||||||
def test_raises_stream_error_on_too_many_requests(self):
|
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"
|
url = "https://www.bbc.co.uk/news"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue