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
This commit is contained in:
parent
b7f6846480
commit
2d98486d06
@ -35,7 +35,6 @@ kombu==4.0.0
|
|||||||
linecache2==1.0.0
|
linecache2==1.0.0
|
||||||
MarkupSafe==1.0
|
MarkupSafe==1.0
|
||||||
mccabe==0.2.1
|
mccabe==0.2.1
|
||||||
mock==2.0.0
|
|
||||||
monotonic==0.6
|
monotonic==0.6
|
||||||
mox3==0.20.0
|
mox3==0.20.0
|
||||||
msgpack-python==0.4.0
|
msgpack-python==0.4.0
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
import mock
|
|
||||||
from openstack import exceptions
|
from openstack import exceptions
|
||||||
from openstack.identity.v3 import project
|
from openstack.identity.v3 import project
|
||||||
import testtools
|
import testtools
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
from osc_lib.command import command
|
from osc_lib.command import command
|
||||||
from osc_lib import exceptions
|
from osc_lib import exceptions
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
from osc_lib.command import commandmanager
|
from osc_lib.command import commandmanager
|
||||||
from osc_lib.tests import utils
|
from osc_lib.tests import utils
|
||||||
|
@ -13,9 +13,9 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
import mock
|
|
||||||
import six
|
import six
|
||||||
import sys
|
import sys
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from keystoneauth1 import fixture
|
from keystoneauth1 import fixture
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import copy
|
import copy
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
from keystoneauth1.access import service_catalog
|
from keystoneauth1.access import service_catalog
|
||||||
from keystoneauth1 import exceptions as ksa_exceptions
|
from keystoneauth1 import exceptions as ksa_exceptions
|
||||||
|
@ -11,8 +11,9 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import mock
|
|
||||||
|
|
||||||
from osc_lib import logs
|
from osc_lib import logs
|
||||||
from osc_lib.tests import utils
|
from osc_lib.tests import utils
|
||||||
|
@ -14,10 +14,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import copy
|
import copy
|
||||||
import mock
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import testtools
|
import testtools
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from osc_lib import shell
|
from osc_lib import shell
|
||||||
from osc_lib.tests import utils
|
from osc_lib.tests import utils
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
import contextlib
|
import contextlib
|
||||||
import copy
|
import copy
|
||||||
import json as jsonutils
|
import json as jsonutils
|
||||||
import mock
|
|
||||||
import os
|
import os
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from cliff import columns as cliff_columns
|
from cliff import columns as cliff_columns
|
||||||
import fixtures
|
import fixtures
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import mock
|
from unittest import mock
|
||||||
|
|
||||||
from osc_lib.tests import utils as test_utils
|
from osc_lib.tests import utils as test_utils
|
||||||
from osc_lib.utils import tags
|
from osc_lib.utils import tags
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
|
|
||||||
import six
|
import six
|
||||||
import time
|
import time
|
||||||
|
from unittest import mock
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from cliff import columns as cliff_columns
|
from cliff import columns as cliff_columns
|
||||||
import mock
|
|
||||||
|
|
||||||
from osc_lib.cli import format_columns
|
from osc_lib.cli import format_columns
|
||||||
from osc_lib import exceptions
|
from osc_lib import exceptions
|
||||||
|
@ -5,7 +5,6 @@ hacking>=3.0,<3.1.0 # Apache-2.0
|
|||||||
|
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.0 # Apache-2.0
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
mock>=2.0.0 # BSD
|
|
||||||
oslotest>=3.2.0 # Apache-2.0
|
oslotest>=3.2.0 # Apache-2.0
|
||||||
requests-mock>=1.1.0 # Apache-2.0
|
requests-mock>=1.1.0 # Apache-2.0
|
||||||
sphinx!=1.6.6,>=1.6.2 # BSD
|
sphinx!=1.6.6,>=1.6.2 # BSD
|
||||||
|
Loading…
Reference in New Issue
Block a user