Use unittest.mock instead of third party mock

Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib.

Change-Id: I749d6ebdef9163ffa3135778a4accbb8be5ba9e3

freezer_api/tests/unit/cmd/test_cmd.py

@@ -10,10 +10,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
-from oslo_config import cfg
 import sys
 import unittest
+from unittest import mock
+
+from oslo_config import cfg
 
 from freezer_api.cmd import manage as freezer_manage
 

freezer_api/tests/unit/sqlalchemy/v1/test_action.py

@@ -16,8 +16,9 @@
 """Tests for manipulating Action via the DB API"""
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
+
 from oslo_config import cfg
 
 from freezer_api.common import exceptions as freezer_api_exc

freezer_api/tests/unit/sqlalchemy/v1/test_api_common.py

@@ -18,8 +18,9 @@
 """Tests for manipulating job via the DB API"""
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
+
 from oslo_config import cfg
 
 from freezer_api.common import exceptions as freezer_api_exc

freezer_api/tests/unit/sqlalchemy/v1/test_backup.py

@@ -17,8 +17,9 @@
 
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
+
 from oslo_config import cfg
 
 from freezer_api.common import exceptions as freezer_api_exc

freezer_api/tests/unit/sqlalchemy/v1/test_job.py

@@ -18,8 +18,9 @@
 """Tests for manipulating job via the DB API"""
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
+
 from oslo_config import cfg
 
 from freezer_api.common import exceptions as freezer_api_exc

freezer_api/tests/unit/sqlalchemy/v1/test_session.py

@@ -18,8 +18,9 @@
 """Tests for manipulating job via the DB API"""
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
+
 from oslo_config import cfg
 
 from freezer_api.common import exceptions as freezer_api_exc

freezer_api/tests/unit/sqlalchemy/v2/test_action.py

@@ -16,8 +16,8 @@
 """Tests for manipulating Action via the DB API"""
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from freezer_api.common import exceptions as freezer_api_exc
 from freezer_api.tests.unit import common

freezer_api/tests/unit/sqlalchemy/v2/test_api_common.py

@@ -18,8 +18,8 @@
 """Tests for manipulating job via the DB API"""
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from freezer_api.common import exceptions as freezer_api_exc
 from freezer_api.db.sqlalchemy import api

freezer_api/tests/unit/sqlalchemy/v2/test_backup.py

@@ -17,8 +17,8 @@
 
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from freezer_api.common import exceptions as freezer_api_exc
 from freezer_api.tests.unit import common

freezer_api/tests/unit/sqlalchemy/v2/test_job.py

@@ -18,8 +18,8 @@
 """Tests for manipulating job via the DB API"""
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from freezer_api.common import exceptions as freezer_api_exc
 from freezer_api.tests.unit import common

freezer_api/tests/unit/sqlalchemy/v2/test_session.py

@@ -14,12 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 """Tests for manipulating job via the DB API"""
 
 import copy
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from freezer_api.common import exceptions as freezer_api_exc
 from freezer_api.tests.unit import common

freezer_api/tests/unit/test_elastic.py

@@ -19,8 +19,9 @@ limitations under the License.
 import unittest
 
 import elasticsearch
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
+
 from oslo_config import cfg
 
 from freezer_api.common import exceptions

freezer_api/tests/unit/test_elasticv2.py

@@ -18,8 +18,9 @@
 import unittest
 
 import elasticsearch
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
+
 from oslo_config import cfg
 
 from freezer_api.common import exceptions

freezer_api/tests/unit/test_exceptions.py

@@ -15,7 +15,7 @@
 import unittest
 
 import falcon
-import mock
+from unittest import mock
 
 from freezer_api.common import exceptions
 from freezer_api.tests.unit import common

freezer_api/tests/unit/test_versions.py

@@ -17,7 +17,7 @@ limitations under the License.
 """
 
 import falcon
-import mock
+from unittest import mock
 
 from oslo_serialization import jsonutils as json
 

freezer_api/tests/unit/v1/test_actions.py

@@ -18,7 +18,7 @@ limitations under the License.
 import random
 
 import falcon
-import mock
+from unittest import mock
 
 from freezer_api.api.v1 import actions as v1_actions
 from freezer_api.common import exceptions

freezer_api/tests/unit/v1/test_backups.py

@@ -17,7 +17,7 @@ limitations under the License.
 """
 
 import falcon
-import mock
+from unittest import mock
 
 from freezer_api.api.v1 import backups
 from freezer_api.common import exceptions

freezer_api/tests/unit/v1/test_clients.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import falcon
-import mock
+from unittest import mock
 
 from freezer_api.api.v1 import clients as v1_clients
 from freezer_api.common import exceptions

freezer_api/tests/unit/v1/test_homedoc.py

@@ -16,7 +16,7 @@ limitations under the License.
 
 """
 
-import mock
+from unittest import mock
 
 from oslo_serialization import jsonutils as json
 

freezer_api/tests/unit/v1/test_jobs.py

@@ -19,8 +19,8 @@ limitations under the License.
 import random
 
 import falcon
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from oslo_serialization import jsonutils as json
 

freezer_api/tests/unit/v1/test_sessions.py

@@ -18,8 +18,8 @@ limitations under the License.
 import random
 
 import falcon
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from freezer_api.api.v1 import sessions as v1_sessions
 from freezer_api.common import exceptions

freezer_api/tests/unit/v2/test_actions.py

@@ -18,7 +18,7 @@ limitations under the License.
 import random
 
 import falcon
-import mock
+from unittest import mock
 
 from freezer_api.api.v2 import actions as v2_actions
 from freezer_api.common import exceptions

freezer_api/tests/unit/v2/test_backups.py

@@ -17,7 +17,7 @@ limitations under the License.
 """
 
 import falcon
-import mock
+from unittest import mock
 
 from freezer_api.api.v2 import backups
 from freezer_api.common import exceptions

freezer_api/tests/unit/v2/test_clients.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import falcon
-import mock
+from unittest import mock
 
 from freezer_api.api.v2 import clients as v2_clients
 from freezer_api.common import exceptions

freezer_api/tests/unit/v2/test_homedoc.py

@@ -17,7 +17,7 @@ limitations under the License.
 
 """
 
-import mock
+from unittest import mock
 
 from oslo_serialization import jsonutils as json
 

freezer_api/tests/unit/v2/test_jobs.py

@@ -19,8 +19,8 @@ limitations under the License.
 import random
 
 import falcon
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from oslo_serialization import jsonutils as json
 

freezer_api/tests/unit/v2/test_sessions.py

@@ -18,8 +18,8 @@ limitations under the License.
 import random
 
 import falcon
-import mock
-from mock import patch
+from unittest import mock
+from unittest.mock import patch
 
 from freezer_api.api.v2 import sessions as v2_sessions
 from freezer_api.common import exceptions

lower-constraints.txt

@@ -27,7 +27,6 @@ logilab-common==1.4.1
 Mako==1.0.7
 MarkupSafe==1.0
 mccabe==0.4.0
-mock==2.0.0
 monotonic==1.4
 msgpack==0.5.6
 netaddr==0.7.19

test-requirements.txt

@@ -5,7 +5,6 @@ flake8<2.6.0,>=2.5.4 # MIT
 #pylint==1.9.2 # GPLv2
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
-mock>=2.0.0 # BSD
 fixtures>=3.0.0 # Apache-2.0/BSD
 oslotest>=3.3.0 # Apache-2.0
 sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD