Browse Source

Merge "Use unittest.mock instead of third party mock"

tags/4.1.1^0
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
af89f7053f
9 changed files with 8 additions and 11 deletions
  1. +0
    -1
      lower-constraints.txt
  2. +1
    -1
      oslo_utils/tests/test_eventletutils.py
  3. +1
    -1
      oslo_utils/tests/test_excutils.py
  4. +1
    -1
      oslo_utils/tests/test_fnmatch.py
  5. +1
    -1
      oslo_utils/tests/test_netutils.py
  6. +1
    -1
      oslo_utils/tests/test_strutils.py
  7. +1
    -1
      oslo_utils/tests/test_timeutils.py
  8. +2
    -1
      oslo_utils/tests/tests_encodeutils.py
  9. +0
    -3
      test-requirements.txt

+ 0
- 1
lower-constraints.txt View File

@@ -14,7 +14,6 @@ iso8601==0.1.11
keystoneauth1==3.4.0
linecache2==1.0.0
mccabe==0.2.1
mock==2.0.0
netaddr==0.7.18
netifaces==0.10.4
os-client-config==1.28.0


+ 1
- 1
oslo_utils/tests/test_eventletutils.py View File

@@ -13,11 +13,11 @@
# under the License.

import threading
from unittest import mock
import warnings

import eventlet
from eventlet import greenthread
import mock
from oslotest import base as test_base
import six



+ 1
- 1
oslo_utils/tests/test_excutils.py View File

@@ -13,9 +13,9 @@
# under the License.

import logging
from unittest import mock

import fixtures
import mock
from oslotest import base as test_base

from oslo_utils import excutils


+ 1
- 1
oslo_utils/tests/test_fnmatch.py View File

@@ -16,8 +16,8 @@ import fnmatch as standard_fnmatch
import ntpath
import posixpath
import sys
from unittest import mock

import mock
from oslotest import base
import six



+ 1
- 1
oslo_utils/tests/test_netutils.py View File

@@ -15,8 +15,8 @@

import contextlib
import socket
from unittest import mock

import mock
import netifaces
from oslotest import base as test_base
import six


+ 1
- 1
oslo_utils/tests/test_strutils.py View File

@@ -18,9 +18,9 @@
import collections
import copy
import math
from unittest import mock

import ddt
import mock
from oslotest import base as test_base
import six
import testscenarios


+ 1
- 1
oslo_utils/tests/test_timeutils.py View File

@@ -17,9 +17,9 @@ import calendar
import datetime
import logging
import time
from unittest import mock

import iso8601
import mock
from oslotest import base as test_base
from testtools import matchers



+ 2
- 1
oslo_utils/tests/tests_encodeutils.py View File

@@ -15,7 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.

import mock
from unittest import mock

from oslo_i18n import fixture as oslo_i18n_fixture
from oslotest import base as test_base
import six


+ 0
- 3
test-requirements.txt View File

@@ -17,9 +17,6 @@ stestr>=2.0.0 # Apache-2.0
# deps = {[testenv]deps} coverage
coverage!=4.4,>=4.0 # Apache-2.0

# mocking framework
mock>=2.0.0 # BSD

# used for oslotest cross-testing scripts
oslo.config>=5.2.0 # Apache-2.0



Loading…
Cancel
Save