Removing dependency on the "mock" package

Now that we are python3 only, we should move to using the built
in version of mock that supports all of our testing needs and
remove the dependency on the "mock" package.

Also see commit: Ifcaf1c21bea0ec3c35278e49cecc90a101a82113

Change-Id: I11dc8a80471be347f89a30f59c1cc14cdb879726
This commit is contained in:
asarfaty 2020-05-10 17:29:29 +02:00
parent 917ac30039
commit 27077b385c
18 changed files with 17 additions and 20 deletions

View File

@ -6,7 +6,6 @@ fixtures==3.0.0
flake8==2.6.2 flake8==2.6.2
flake8-import-order==0.12 flake8-import-order==0.12
hacking>=1.1.0 # Apache-2.0 hacking>=1.1.0 # Apache-2.0
mock==2.0.0
netaddr==0.7.18 netaddr==0.7.18
openstackdocstheme==1.18.1 openstackdocstheme==1.18.1
oslo.i18n==3.15.3 oslo.i18n==3.15.3

View File

@ -8,7 +8,6 @@ bandit!=1.6.0,>=1.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.00 coverage!=4.4,>=4.0 # Apache-2.00
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD
flake8-import-order==0.12 # LGPLv3 flake8-import-order==0.12 # LGPLv3
mock>=2.0.0 # BSD
python-subunit>=1.0.0 # Apache-2.0/BSD python-subunit>=1.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0

View File

@ -15,8 +15,8 @@
# #
import copy import copy
import unittest import unittest
from unittest import mock
import mock
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import uuidutils from oslo_utils import uuidutils
from requests import models from requests import models

View File

@ -14,7 +14,7 @@
# under the License. # under the License.
# #
import mock from unittest import mock
from vmware_nsxlib.tests.unit.v3.policy import test_resources from vmware_nsxlib.tests.unit.v3.policy import test_resources
from vmware_nsxlib.v3.policy import ipsec_vpn_defs from vmware_nsxlib.v3.policy import ipsec_vpn_defs

View File

@ -14,7 +14,7 @@
# under the License. # under the License.
# #
import mock from unittest import mock
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
from vmware_nsxlib.tests.unit.v3.policy import test_resources from vmware_nsxlib.tests.unit.v3.policy import test_resources

View File

@ -14,7 +14,7 @@
# under the License. # under the License.
# #
import mock from unittest import mock
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
from vmware_nsxlib.tests.unit.v3.policy import policy_testcase from vmware_nsxlib.tests.unit.v3.policy import policy_testcase

View File

@ -16,7 +16,7 @@
import copy import copy
import mock from unittest import mock
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
from vmware_nsxlib.tests.unit.v3.policy import policy_testcase from vmware_nsxlib.tests.unit.v3.policy import policy_testcase

View File

@ -15,8 +15,8 @@
# #
import os import os
from unittest import mock
import mock
from OpenSSL import crypto from OpenSSL import crypto
from oslo_serialization import jsonutils from oslo_serialization import jsonutils

View File

@ -14,8 +14,8 @@
# under the License. # under the License.
# #
import unittest import unittest
from unittest import mock
import mock
from requests import codes from requests import codes
from requests import exceptions as requests_exceptions from requests import exceptions as requests_exceptions
from requests import models from requests import models

View File

@ -14,7 +14,7 @@
# under the License. # under the License.
# #
import mock from unittest import mock
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase

View File

@ -14,7 +14,7 @@
# under the License. # under the License.
# #
import mock from unittest import mock
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
from vmware_nsxlib.tests.unit.v3 import test_constants as consts from vmware_nsxlib.tests.unit.v3 import test_constants as consts

View File

@ -12,7 +12,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# 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 vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
from vmware_nsxlib.v3 import exceptions as nsxlib_exc from vmware_nsxlib.v3 import exceptions as nsxlib_exc

View File

@ -14,8 +14,8 @@
# limitations under the License. # limitations under the License.
# #
import copy import copy
from unittest import mock
import mock
from oslo_log import log from oslo_log import log
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase

View File

@ -14,9 +14,9 @@
# under the License. # under the License.
# #
import copy import copy
from unittest import mock
import eventlet import eventlet
import mock
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import uuidutils from oslo_utils import uuidutils

View File

@ -15,8 +15,7 @@
# #
import copy import copy
from unittest import mock
import mock
from oslo_utils import uuidutils from oslo_utils import uuidutils

View File

@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import mock from unittest import mock
import six
from oslo_utils import uuidutils from oslo_utils import uuidutils
import six
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
from vmware_nsxlib.tests.unit.v3 import test_constants from vmware_nsxlib.tests.unit.v3 import test_constants

View File

@ -14,7 +14,7 @@
# under the License. # under the License.
# #
import mock from unittest import mock
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
from vmware_nsxlib.tests.unit.v3 import test_constants as consts from vmware_nsxlib.tests.unit.v3 import test_constants as consts

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import mock from unittest import mock
from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
from vmware_nsxlib.v3 import exceptions from vmware_nsxlib.v3 import exceptions