Browse Source

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

changes/40/737440/1 2.2.0
Zuul 1 year ago
committed by Gerrit Code Review
parent
commit
670fe7ce2a
  1. 4
      heatclient/tests/unit/osc/utils.py
  2. 2
      heatclient/tests/unit/osc/v1/fakes.py
  3. 2
      heatclient/tests/unit/osc/v1/test_build_info.py
  4. 2
      heatclient/tests/unit/osc/v1/test_event.py
  5. 2
      heatclient/tests/unit/osc/v1/test_resource.py
  6. 5
      heatclient/tests/unit/osc/v1/test_snapshot.py
  7. 3
      heatclient/tests/unit/osc/v1/test_software_config.py
  8. 2
      heatclient/tests/unit/osc/v1/test_software_deployment.py
  9. 2
      heatclient/tests/unit/osc/v1/test_stack.py
  10. 2
      heatclient/tests/unit/osc/v1/test_stack_failures.py
  11. 2
      heatclient/tests/unit/osc/v1/test_template.py
  12. 3
      heatclient/tests/unit/test_build_info.py
  13. 2
      heatclient/tests/unit/test_common_http.py
  14. 3
      heatclient/tests/unit/test_deployment_utils.py
  15. 3
      heatclient/tests/unit/test_environment_format.py
  16. 3
      heatclient/tests/unit/test_event_utils.py
  17. 3
      heatclient/tests/unit/test_events.py
  18. 3
      heatclient/tests/unit/test_resource_types.py
  19. 3
      heatclient/tests/unit/test_resources.py
  20. 2
      heatclient/tests/unit/test_shell.py
  21. 3
      heatclient/tests/unit/test_software_configs.py
  22. 3
      heatclient/tests/unit/test_software_deployments.py
  23. 3
      heatclient/tests/unit/test_stacks.py
  24. 3
      heatclient/tests/unit/test_template_format.py
  25. 2
      heatclient/tests/unit/test_template_utils.py
  26. 2
      heatclient/tests/unit/test_utils.py
  27. 3
      heatclient/tests/unit/v1/test_hooks.py
  28. 1
      lower-constraints.txt
  29. 1
      test-requirements.txt

4
heatclient/tests/unit/osc/utils.py

@ -15,10 +15,10 @@
#
import os
import sys
from unittest import mock
import fixtures
import mock
import sys
import testtools
from heatclient.tests.unit.osc import fakes

2
heatclient/tests/unit/osc/v1/fakes.py

@ -13,7 +13,7 @@
# under the License.
#
import mock
from unittest import mock
from heatclient.tests.unit.osc import utils

2
heatclient/tests/unit/osc/v1/test_build_info.py

@ -11,7 +11,7 @@
# under the License.
#
import mock
from unittest import mock
from heatclient.osc.v1 import build_info as osc_build_info
from heatclient.tests.unit.osc.v1 import fakes as orchestration_fakes

2
heatclient/tests/unit/osc/v1/test_event.py

@ -13,8 +13,8 @@
# Copyright 2015 IBM Corp.
import copy
from unittest import mock
import mock
import testscenarios
from heatclient import exc

2
heatclient/tests/unit/osc/v1/test_resource.py

@ -12,8 +12,8 @@
#
import copy
from unittest import mock
import mock
from osc_lib import exceptions as exc
from heatclient import exc as heat_exc

5
heatclient/tests/unit/osc/v1/test_snapshot.py

@ -9,8 +9,9 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
import mock
from unittest import mock
from osc_lib import exceptions as exc
import six

3
heatclient/tests/unit/osc/v1/test_software_config.py

@ -11,7 +11,8 @@
# under the License.
#
import mock
from unittest import mock
from osc_lib import exceptions as exc
import yaml

2
heatclient/tests/unit/osc/v1/test_software_deployment.py

@ -12,8 +12,8 @@
#
import copy
from unittest import mock
import mock
from osc_lib import exceptions as exc
from heatclient import exc as heat_exc

2
heatclient/tests/unit/osc/v1/test_stack.py

@ -13,8 +13,8 @@
import copy
import io
from unittest import mock
import mock
from osc_lib import exceptions as exc
from osc_lib import utils
import six

2
heatclient/tests/unit/osc/v1/test_stack_failures.py

@ -14,7 +14,7 @@
import collections
import mock
from unittest import mock
from heatclient import exc
from heatclient.osc.v1 import stack_failures

2
heatclient/tests/unit/osc/v1/test_template.py

@ -12,7 +12,7 @@
#
# Copyright 2015 IBM Corp.
import mock
from unittest import mock
from heatclient import exc
from heatclient.osc.v1 import template

3
heatclient/tests/unit/test_build_info.py

@ -13,7 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from oslo_serialization import jsonutils
import testtools

2
heatclient/tests/unit/test_common_http.py

@ -13,9 +13,9 @@
# limitations under the License.
import socket
from unittest import mock
from keystoneauth1 import adapter
import mock
from oslo_serialization import jsonutils
import six
import testtools

3
heatclient/tests/unit/test_deployment_utils.py

@ -11,7 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
import six
import swiftclient.client
import testscenarios

3
heatclient/tests/unit/test_environment_format.py

@ -10,7 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import six
import testscenarios
import testtools

3
heatclient/tests/unit/test_event_utils.py

@ -10,7 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import testtools
from heatclient.common import event_utils

3
heatclient/tests/unit/test_events.py

@ -12,7 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import testtools
from heatclient.common import utils

3
heatclient/tests/unit/test_resource_types.py

@ -11,7 +11,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import testtools
from heatclient.common import utils

3
heatclient/tests/unit/test_resources.py

@ -12,7 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from six.moves.urllib import parse
import testtools

2
heatclient/tests/unit/test_shell.py

@ -14,11 +14,11 @@
import os
import sys
import tempfile
from unittest import mock
import uuid
import fixtures
from keystoneauth1 import fixture as keystone_fixture
import mock
from oslo_serialization import jsonutils
from oslo_utils import encodeutils
from requests_mock.contrib import fixture as rm_fixture

3
heatclient/tests/unit/test_software_configs.py

@ -10,7 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import testtools
from heatclient.common import utils

3
heatclient/tests/unit/test_software_deployments.py

@ -10,7 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import testtools
from heatclient.common import utils

3
heatclient/tests/unit/test_stacks.py

@ -10,7 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import testscenarios
from testscenarios import scenarios as scnrs
import testtools

3
heatclient/tests/unit/test_template_format.py

@ -10,7 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import six
import testscenarios
import testtools

2
heatclient/tests/unit/test_template_utils.py

@ -13,8 +13,8 @@
import json
import tempfile
from unittest import mock
import mock
from oslo_serialization import base64
import six
from six.moves.urllib import error

2
heatclient/tests/unit/test_utils.py

@ -14,8 +14,8 @@
# under the License.
import os
from unittest import mock
import mock
import testtools
from heatclient.common import utils

3
heatclient/tests/unit/v1/test_hooks.py

@ -11,7 +11,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from unittest import mock
import testtools
from heatclient.common import hook_utils

1
lower-constraints.txt

@ -31,7 +31,6 @@ keystoneauth1==3.4.0
linecache2==1.0.0
MarkupSafe==1.0
mccabe==0.2.1
mock==2.0.0
monotonic==0.6
msgpack-python==0.4.0
munch==2.1.0

1
test-requirements.txt

@ -7,7 +7,6 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
requests-mock>=1.2.0 # Apache-2.0
mock>=2.0.0 # BSD
python-openstackclient>=3.12.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0
tempest>=17.1.0 # Apache-2.0

Loading…
Cancel
Save