Merge "Use unittest.mock instead of mock"

refstack/tests/api/test_products.py

@@ -14,8 +14,8 @@
 
 import json
 import uuid
+from unittest import mock
 
-import mock
 from oslo_config import fixture as config_fixture
 import webtest.app
 

refstack/tests/api/test_profile.py

@@ -14,13 +14,13 @@
 
 import binascii
 import json
+from unittest import mock
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import padding
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives import serialization
-import mock
 import webtest.app
 
 from refstack.tests import api

refstack/tests/api/test_results.py

@@ -14,8 +14,8 @@
 
 import json
 import uuid
+from unittest import mock
 
-import mock
 from oslo_config import fixture as config_fixture
 import webtest.app
 

refstack/tests/api/test_vendors.py

@@ -14,8 +14,8 @@
 
 import json
 import uuid
+from unittest import mock
 
-import mock
 from oslo_config import fixture as config_fixture
 import webtest.app
 

refstack/tests/unit/__init__.py

@@ -14,7 +14,8 @@
 #    under the License.
 """Refstack unittests."""
 
-import mock
+from unittest import mock
+
 from oslotest import base
 
 

refstack/tests/unit/test_api.py

@@ -16,8 +16,8 @@
 """Tests for API's controllers"""
 
 import json
+from unittest import mock
 
-import mock
 from oslo_config import fixture as config_fixture
 from urllib import parse
 import webob.exc

refstack/tests/unit/test_api_utils.py

@@ -15,8 +15,8 @@
 
 """Tests for API's utils"""
 import time
+from unittest import mock
 
-import mock
 from oslo_config import fixture as config_fixture
 from oslo_utils import timeutils
 from oslotest import base

refstack/tests/unit/test_app.py

@@ -16,8 +16,8 @@
 """Tests for API's utility"""
 
 import json
+from unittest import mock
 
-import mock
 from oslo_config import fixture as config_fixture
 from oslotest import base
 import pecan

refstack/tests/unit/test_db.py

@@ -17,7 +17,8 @@
 
 import base64
 import hashlib
-import mock
+from unittest import mock
+
 from oslo_config import fixture as config_fixture
 from oslotest import base
 import sqlalchemy.orm

refstack/tests/unit/test_guidelines.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 import json
+from unittest import mock
 
 import httmock
-import mock
 from oslotest import base
 import requests
 

refstack/tests/unit/test_migration.py

@@ -16,7 +16,8 @@
 """Tests for refstack's migrations."""
 
 import alembic
-import mock
+from unittest import mock
+
 from oslotest import base
 
 from refstack.db import migration

refstack/tests/unit/test_validators.py

@@ -16,6 +16,7 @@
 """Tests for validators."""
 import binascii
 import json
+from unittest import mock
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import padding
@@ -24,7 +25,6 @@ from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives import serialization
 
 import jsonschema
-import mock
 from oslotest import base
 
 from refstack.api import exceptions as api_exc

test-requirements.txt

@@ -4,7 +4,6 @@ pyflakes==0.8.1
 flake8==2.2.4
 docutils>=0.11  # OSI-Approved Open Source, Public Domain
 httmock>=1.2.4
-mock
 oslotest>=1.2.0 # Apache-2.0
 python-subunit>=0.0.18
 stestr>=1.1.0 # Apache-2.0