Use unittest.mock instead of external module. (#4893)

* Use unittest.mock instead of external module.

* Avoid assert_called and assert_called_once, for Python <3.6 compatibility

setup.py

@@ -40,7 +40,6 @@ install_requires = [
 # Testing dependencies
 testing_extras = [
     # Required for running the tests
-    'mock>=1.0.0',
     'python-dateutil>=2.2',
     'pytz>=2014.7',
     'elasticsearch>=1.0.0,<3.0',

wagtail/admin/tests/test_contentstate.py

@@ -1,7 +1,7 @@
 import json
+from unittest.mock import patch
 
 from django.test import TestCase
-from mock import patch
 
 from wagtail.admin.rich_text.converters.contentstate import ContentstateConverter
 from wagtail.embeds.models import Embed

wagtail/admin/tests/test_edit_handlers.py

@@ -1,6 +1,6 @@
 from datetime import date
+from unittest import mock
 
-import mock
 from django import forms
 from django.contrib.auth.models import AnonymousUser
 from django.core import checks

wagtail/admin/tests/test_pages_views.py

@@ -2,8 +2,8 @@ import datetime
 import logging
 import os
 from itertools import chain
+from unittest import mock
 
-import mock
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission

wagtail/api/v2/tests/test_documents.py

@@ -1,6 +1,6 @@
 import json
+from unittest import mock
 
-import mock
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.urls import reverse

wagtail/api/v2/tests/test_images.py

@@ -1,6 +1,6 @@
 import json
+from unittest import mock
 
-import mock
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.urls import reverse

wagtail/api/v2/tests/test_pages.py

@@ -1,6 +1,6 @@
 import collections
 import json
-import mock
+from unittest import mock
 
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase

wagtail/contrib/frontend_cache/tests.py

@@ -1,6 +1,6 @@
+from unittest import mock
 from urllib.error import HTTPError, URLError
 
-import mock
 from django.core.exceptions import ImproperlyConfigured
 from django.test import TestCase
 from django.test.utils import override_settings

wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py

@@ -1,4 +1,5 @@
-import mock
+from unittest import mock
+
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.test import TestCase
@@ -189,7 +190,7 @@ class TestCreateView(TestCase, WagtailTestUtils):
                 mock_form_fields_exclude.return_value = ['123']
 
                 self.get()
-                mock_form_fields_exclude.assert_called()
+                self.assertTrue(mock_form_fields_exclude.called)
                 m.assert_called_with(Book, exclude=mock_form_fields_exclude.return_value)
 
 
@@ -317,7 +318,7 @@ class TestEditView(TestCase, WagtailTestUtils):
                 mock_form_fields_exclude.return_value = ['123']
 
                 self.get(1)
-                mock_form_fields_exclude.assert_called()
+                self.assertTrue(mock_form_fields_exclude.called)
                 m.assert_called_with(Book, exclude=mock_form_fields_exclude.return_value)
 
 

wagtail/contrib/routable_page/tests.py

@@ -1,4 +1,5 @@
-import mock
+from unittest import mock
+
 from django.test import RequestFactory, TestCase
 from django.urls.exceptions import NoReverseMatch
 

wagtail/core/tests/test_rich_text.py

@@ -1,6 +1,7 @@
+from unittest.mock import patch
+
 from bs4 import BeautifulSoup
 from django.test import TestCase
-from mock import patch
 
 from wagtail.core.models import Page
 from wagtail.core.rich_text import RichText, expand_db_html

wagtail/documents/tests/test_views.py

@@ -1,7 +1,7 @@
 import os.path
 import unittest
+from unittest import mock
 
-import mock
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.test import TestCase

wagtail/embeds/tests.py

@@ -1,6 +1,7 @@
 import json
 import unittest
 import urllib.request
+from unittest.mock import patch
 from urllib.error import URLError
 
 from bs4 import BeautifulSoup
@@ -8,7 +9,6 @@ from django import template
 from django.core.exceptions import ValidationError
 from django.test import TestCase, override_settings
 from django.urls import reverse
-from mock import patch
 
 from wagtail.core import blocks
 from wagtail.core.rich_text import expand_db_html

wagtail/images/tests/test_image_operations.py

@@ -1,7 +1,7 @@
 from io import BytesIO
+from unittest.mock import Mock, patch
 
 from django.test import TestCase, override_settings
-from mock import Mock, patch
 
 from wagtail.core import hooks
 from wagtail.images import image_operations

wagtail/search/tests/test_elasticsearch2_backend.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import datetime
 import json
+from unittest import mock
 
-import mock
 from django.db.models import Q
 from django.test import TestCase
 from elasticsearch.serializer import JSONSerializer

wagtail/search/tests/test_elasticsearch5_backend.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import datetime
 import json
+from unittest import mock
 
-import mock
 from django.db.models import Q
 from django.test import TestCase
 from elasticsearch.serializer import JSONSerializer

wagtail/search/tests/test_elasticsearch6_backend.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import datetime
 import json
+from unittest import mock
 
-import mock
 from django.db.models import Q
 from django.test import TestCase
 from elasticsearch.serializer import JSONSerializer

wagtail/search/tests/test_index_functions.py

@@ -1,6 +1,6 @@
 from datetime import date
+from unittest import mock
 
-import mock
 from django.test import TestCase, override_settings
 
 from wagtail.core.models import Page
@@ -150,7 +150,7 @@ class TestSignalHandlers(TestCase, WagtailTestUtils):
         obj.title = "Updated test"
         obj.save()
 
-        backend().add.assert_called_once()
+        self.assertEqual(backend().add.call_count, 1)
         indexed_object = backend().add.call_args[0][0]
         self.assertEqual(indexed_object.title, "Updated test")
 
@@ -169,7 +169,7 @@ class TestSignalHandlers(TestCase, WagtailTestUtils):
         obj.publication_date = date(2001, 10, 19)
         obj.save(update_fields=['title'])
 
-        backend().add.assert_called_once()
+        self.assertEqual(backend().add.call_count, 1)
         indexed_object = backend().add.call_args[0][0]
         self.assertEqual(indexed_object.title, "Updated test")
         self.assertEqual(indexed_object.publication_date, date(2017, 10, 18))