Browse Source

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

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

+ 2
- 2
heatclient/tests/unit/osc/utils.py View File

@@ -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


+ 1
- 1
heatclient/tests/unit/osc/v1/fakes.py View File

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

import mock
from unittest import mock

from heatclient.tests.unit.osc import utils



+ 1
- 1
heatclient/tests/unit/osc/v1/test_build_info.py View File

@@ -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


+ 1
- 1
heatclient/tests/unit/osc/v1/test_event.py View File

@@ -13,8 +13,8 @@
# Copyright 2015 IBM Corp.

import copy
from unittest import mock

import mock
import testscenarios

from heatclient import exc


+ 1
- 1
heatclient/tests/unit/osc/v1/test_resource.py View File

@@ -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


+ 3
- 2
heatclient/tests/unit/osc/v1/test_snapshot.py View File

@@ -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



+ 2
- 1
heatclient/tests/unit/osc/v1/test_software_config.py View File

@@ -11,7 +11,8 @@
# under the License.
#

import mock
from unittest import mock

from osc_lib import exceptions as exc
import yaml



+ 1
- 1
heatclient/tests/unit/osc/v1/test_software_deployment.py View File

@@ -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


+ 1
- 1
heatclient/tests/unit/osc/v1/test_stack.py View File

@@ -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


+ 1
- 1
heatclient/tests/unit/osc/v1/test_stack_failures.py View File

@@ -14,7 +14,7 @@

import collections

import mock
from unittest import mock

from heatclient import exc
from heatclient.osc.v1 import stack_failures


+ 1
- 1
heatclient/tests/unit/osc/v1/test_template.py View File

@@ -12,7 +12,7 @@
#
# Copyright 2015 IBM Corp.

import mock
from unittest import mock

from heatclient import exc
from heatclient.osc.v1 import template


+ 2
- 1
heatclient/tests/unit/test_build_info.py View File

@@ -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



+ 1
- 1
heatclient/tests/unit/test_common_http.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_deployment_utils.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_environment_format.py View File

@@ -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
- 1
heatclient/tests/unit/test_event_utils.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_events.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_resource_types.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_resources.py View File

@@ -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



+ 1
- 1
heatclient/tests/unit/test_shell.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_software_configs.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_software_deployments.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_stacks.py View File

@@ -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


+ 2
- 1
heatclient/tests/unit/test_template_format.py View File

@@ -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


+ 1
- 1
heatclient/tests/unit/test_template_utils.py View File

@@ -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


+ 1
- 1
heatclient/tests/unit/test_utils.py View File

@@ -14,8 +14,8 @@
# under the License.

import os
from unittest import mock

import mock
import testtools

from heatclient.common import utils


+ 2
- 1
heatclient/tests/unit/v1/test_hooks.py View File

@@ -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


+ 0
- 1
lower-constraints.txt View File

@@ -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


+ 0
- 1
test-requirements.txt View File

@@ -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