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: I9357128c04f2fe0284432c1f6a543d63309efda3
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2020-04-18 11:53:56 -05:00
parent d63d664b28
commit bf8a79a5e1
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
15 changed files with 26 additions and 15 deletions

View File

@ -10,8 +10,8 @@
# 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
import netaddr import netaddr
from unittest import mock
from neutronclient.v2_0 import client from neutronclient.v2_0 import client
from oslotest import base from oslotest import base

View File

@ -10,7 +10,8 @@
# 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 oslo_utils import uuidutils from oslo_utils import uuidutils
from kuryr.lib import binding from kuryr.lib import binding

View File

@ -11,8 +11,8 @@
# under the License. # under the License.
import glob import glob
import mock
import os import os
from unittest import mock
from oslo_utils import uuidutils from oslo_utils import uuidutils

View File

@ -10,7 +10,8 @@
# 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 oslo_utils import uuidutils from oslo_utils import uuidutils
from kuryr.lib import binding from kuryr.lib import binding

View File

@ -10,7 +10,8 @@
# 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 oslo_utils import uuidutils from oslo_utils import uuidutils
from kuryr.lib import binding from kuryr.lib import binding

View File

@ -10,8 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
import ddt import ddt
import mock
from kuryr.lib import exceptions from kuryr.lib import exceptions
from kuryr_libnetwork.port_driver import base as d_base from kuryr_libnetwork.port_driver import base as d_base

View File

@ -10,8 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
import ddt import ddt
import mock
from oslo_utils import importutils from oslo_utils import importutils

View File

@ -10,8 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
import ddt import ddt
import mock
import os import os
from six.moves.urllib import parse from six.moves.urllib import parse
import sys import sys

View File

@ -12,8 +12,8 @@
from collections import defaultdict from collections import defaultdict
from itertools import groupby from itertools import groupby
import mock
from operator import itemgetter from operator import itemgetter
from unittest import mock
import ddt import ddt
from oslo_serialization import jsonutils from oslo_serialization import jsonutils

View File

@ -10,8 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
import ddt import ddt
import mock
from neutronclient.common import exceptions from neutronclient.common import exceptions
from oslo_serialization import jsonutils from oslo_serialization import jsonutils

View File

@ -9,7 +9,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
import ddt import ddt
from oslo_serialization import jsonutils from oslo_serialization import jsonutils

View File

@ -10,8 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
import ddt import ddt
import mock
from neutronclient.common import exceptions as n_exceptions from neutronclient.common import exceptions as n_exceptions
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_serialization import jsonutils from oslo_serialization import jsonutils

View File

@ -10,8 +10,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
import ddt import ddt
import mock
from neutronclient.common import exceptions as n_exceptions from neutronclient.common import exceptions as n_exceptions
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import uuidutils from oslo_utils import uuidutils

View File

@ -11,10 +11,11 @@
# under the License. # under the License.
import ipaddress import ipaddress
from unittest import mock
import six import six
import ddt import ddt
import mock
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import uuidutils from oslo_utils import uuidutils
from werkzeug import exceptions as w_exceptions from werkzeug import exceptions as w_exceptions

View File

@ -10,9 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from unittest import mock
from ddt import data from ddt import data
from ddt import ddt from ddt import ddt
import mock
from neutronclient.common import exceptions from neutronclient.common import exceptions
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import uuidutils from oslo_utils import uuidutils