Use mock from unittest

Since mock is part of unittest std lib now, we can just use it and
remove the external dependency.

Change-Id: Id71c701b8053af5f8ab26c9f6fa66140e76aa8fc

lower-constraints.txt

@@ -35,7 +35,6 @@ kombu==4.0.0
 linecache2==1.0.0
 MarkupSafe==1.0
 mccabe==0.2.1
-mock==2.0.0
 monotonic==0.6
 mox3==0.20.0
 msgpack-python==0.4.0

osc_lib/tests/cli/test_identity.py

@@ -11,8 +11,8 @@
 #   under the License.
 
 import argparse
+from unittest import mock
 
-import mock
 from openstack import exceptions
 from openstack.identity.v3 import project
 import testtools

osc_lib/tests/command/test_command.py

@@ -12,7 +12,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
+from unittest import mock
 
 from osc_lib.command import command
 from osc_lib import exceptions

osc_lib/tests/command/test_commandmanager.py

@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from osc_lib.command import commandmanager
 from osc_lib.tests import utils

osc_lib/tests/fakes.py

@@ -13,9 +13,9 @@
 #   under the License.
 #
 
-import mock
 import six
 import sys
+from unittest import mock
 
 from keystoneauth1 import fixture
 

osc_lib/tests/test_clientmanager.py

@@ -14,7 +14,7 @@
 #
 
 import copy
-import mock
+from unittest import mock
 
 from keystoneauth1.access import service_catalog
 from keystoneauth1 import exceptions as ksa_exceptions

osc_lib/tests/test_logs.py

@@ -11,8 +11,9 @@
 #   under the License.
 #
 
+from unittest import mock
+
 import logging
-import mock
 
 from osc_lib import logs
 from osc_lib.tests import utils

osc_lib/tests/test_shell.py

@@ -14,10 +14,10 @@
 #
 
 import copy
-import mock
 import os
 import sys
 import testtools
+from unittest import mock
 
 from osc_lib import shell
 from osc_lib.tests import utils

osc_lib/tests/utils/__init__.py

@@ -17,8 +17,8 @@
 import contextlib
 import copy
 import json as jsonutils
-import mock
 import os
+from unittest import mock
 
 from cliff import columns as cliff_columns
 import fixtures

osc_lib/tests/utils/test_tags.py

@@ -13,7 +13,7 @@
 #   under the License.
 
 import argparse
-import mock
+from unittest import mock
 
 from osc_lib.tests import utils as test_utils
 from osc_lib.utils import tags

osc_lib/tests/utils/test_utils.py

@@ -15,10 +15,10 @@
 
 import six
 import time
+from unittest import mock
 import uuid
 
 from cliff import columns as cliff_columns
-import mock
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions

test-requirements.txt

@@ -5,7 +5,6 @@ hacking>=3.0,<3.1.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 requests-mock>=1.1.0 # Apache-2.0
 sphinx!=1.6.6,>=1.6.2 # BSD