mock replace

circle/common/tests/celery_mock.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License along
 # You should have received a copy of the GNU General Public License along
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from mock import patch
+from unittest.mock import patch
 
 
 
 
 class MockCeleryMixin(object):
 class MockCeleryMixin(object):

circle/common/tests/test_models.py

@@ -18,7 +18,7 @@
 from collections import deque
 from collections import deque
 
 
 from django.test import TestCase
 from django.test import TestCase
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 
 from .celery_mock import MockCeleryMixin
 from .celery_mock import MockCeleryMixin
 from .models import TestClass
 from .models import TestClass

circle/common/tests/test_operations.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License along
 # You should have received a copy of the GNU General Public License along
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 
 from django.test import TestCase
 from django.test import TestCase
 
 

circle/dashboard/tests/test_mockedviews.py

@@ -19,7 +19,7 @@ import unittest
 import warnings
 import warnings
 
 
 from factory import Factory, Sequence
 from factory import Factory, Sequence
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 
 from django.contrib.auth.models import User, AnonymousUser
 from django.contrib.auth.models import User, AnonymousUser
 from django.core.exceptions import PermissionDenied
 from django.core.exceptions import PermissionDenied

circle/dashboard/tests/test_periodic_task.py

@@ -16,7 +16,7 @@
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
 
 import unittest
 import unittest
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 
 from django.contrib.auth.models import User
 from django.contrib.auth.models import User
 
 

circle/dashboard/tests/test_views.py

@@ -33,7 +33,7 @@ from circle.vm.operations import (WakeUpOperation, AddInterfaceOperation,
                            DeployOperation, RenameOperation)
                            DeployOperation, RenameOperation)
 from ..models import Profile
 from ..models import Profile
 from circle.firewall.models import Vlan, Host, VlanGroup
 from circle.firewall.models import Vlan, Host, VlanGroup
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from simplesshkey.models import UserKey
 from simplesshkey.models import UserKey
 
 
 import django.conf
 import django.conf

circle/firewall/tests/test_firewall.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License along
 # You should have received a copy of the GNU General Public License along
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from mock import patch
+from unittest.mock import patch
 from netaddr import IPSet, AddrFormatError
 from netaddr import IPSet, AddrFormatError
 
 
 import django.conf
 import django.conf

circle/network/tests/test_views.py

@@ -18,7 +18,7 @@
 from django.test import TestCase
 from django.test import TestCase
 from django.test.client import Client
 from django.test.client import Client
 from django.contrib.auth.models import User, Group
 from django.contrib.auth.models import User, Group
-from mock import Mock
+from unittest.mock import Mock
 
 
 from common.tests.celery_mock import MockCeleryMixin
 from common.tests.celery_mock import MockCeleryMixin
 from dashboard.tests.test_views import LoginMixin
 from dashboard.tests.test_views import LoginMixin

circle/request/tests.py

@@ -19,7 +19,7 @@ from django.test import TestCase
 from django.test.client import Client
 from django.test.client import Client
 from django.contrib.auth.models import User, Permission
 from django.contrib.auth.models import User, Permission
 
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 
 
 
 from common.tests.celery_mock import MockCeleryMixin
 from common.tests.celery_mock import MockCeleryMixin

circle/storage/tests/test_models.py

@@ -19,7 +19,7 @@ from datetime import timedelta
 
 
 from django.test import TestCase
 from django.test import TestCase
 from django.utils import timezone
 from django.utils import timezone
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 
 from ..models import Disk, DataStore
 from ..models import Disk, DataStore
 
 

circle/vm/tests/test_models.py

@@ -16,7 +16,7 @@
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
 
 from datetime import datetime
 from datetime import datetime
-from mock import Mock, MagicMock, patch, call
+from unittest.mock import Mock, MagicMock, patch, call
 import types
 import types
 
 
 from celery.contrib.abortable import AbortableAsyncResult
 from celery.contrib.abortable import AbortableAsyncResult

circle/vm/tests/test_operations.py

@@ -16,7 +16,7 @@
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
 
 from django.test import TestCase
 from django.test import TestCase
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 
 from common.operations import operation_registry_name as op_reg_name
 from common.operations import operation_registry_name as op_reg_name
 from vm.models import Instance, InstanceActivity, Node
 from vm.models import Instance, InstanceActivity, Node