diff options
| author | Doug Hellmann <doug@doughellmann.com> | 2018-08-28 17:20:43 -0400 |
|---|---|---|
| committer | Nguyen Hai <nguyentrihai93@gmail.com> | 2018-09-17 01:42:23 +0000 |
| commit | d73ea9d3772d60eab8c410e5772954c637052e30 (patch) | |
| tree | a91e0a15782da4c67b782fcec29415e044fd7ee6 | |
| parent | 082f728d179dc2bba64e9821eaec18f429aa15fd (diff) | |
| download | python-heatclient-d73ea9d3772d60eab8c410e5772954c637052e30.tar.gz | |
import zuul job settings from project-config
This is a mechanically generated patch to complete step 1 of moving
the zuul job settings out of project-config and into each project
repository.
Because there will be a separate patch on each branch, the branch
specifiers for branch-specific jobs have been removed.
Because this patch is generated by a script, there may be some
cosmetic changes to the layout of the YAML file(s) as the contents are
normalized.
See the python3-first goal document for details:
https://governance.openstack.org/tc/goals/stein/python3-first.html
Change-Id: Iba0ff94c555434a660f1054a531b0f4b6b61a347
Story: #2002586
Task: #24298
| -rw-r--r-- | .zuul.yaml | 11 | ||||
| -rw-r--r-- | heatclient/tests/unit/test_shell.py | 3 | ||||
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 6 |
4 files changed, 16 insertions, 5 deletions
diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..0e4257f --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,11 @@ +- project: + templates: + - openstack-python-jobs + - openstack-python35-jobs + - check-requirements + - openstackclient-plugin-jobs + - publish-openstack-sphinx-docs + - release-notes-jobs + post: + jobs: + - openstack-tox-cover diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py index a97ac3f..40057d3 100644 --- a/heatclient/tests/unit/test_shell.py +++ b/heatclient/tests/unit/test_shell.py @@ -22,7 +22,6 @@ import mock import mox from oslo_serialization import jsonutils from oslo_utils import encodeutils -from oslotest import mockpatch import requests from requests_mock.contrib import fixture as rm_fixture import six @@ -123,7 +122,7 @@ class TestCase(testtools.TestCase): # NOTE(tlashchova): this overrides the testtools.TestCase.patch method # that does simple monkey-patching in favor of mock's patching def patch(self, target, **kwargs): - mockfixture = self.useFixture(mockpatch.Patch(target, **kwargs)) + mockfixture = self.useFixture(fixtures.MockPatch(target, **kwargs)) return mockfixture.mock def stack_list_resp_dict(self, show_nested=False): diff --git a/test-requirements.txt b/test-requirements.txt index ed21859..9978552 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,6 @@ requests-mock>=1.1 # Apache-2.0 mock>=2.0 # BSD mox3!=0.19.0,>=0.7.0 # Apache-2.0 oslosphinx>=4.7.0 # Apache-2.0 -oslotest>=1.10.0 # Apache-2.0 python-openstackclient>=3.3.0 # Apache-2.0 sphinx!=1.3b1,<1.4,>=1.2.1 # BSD tempest>=12.1.0 # Apache-2.0 @@ -6,8 +6,10 @@ skipsdist = True [testenv] setenv = VIRTUAL_ENV={envdir} usedevelop = True -install_command = pip install -U {opts} {packages} -deps = -r{toxinidir}/requirements.txt +install_command = pip install {opts} {packages} +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.py[c|o]" -delete python setup.py testr --slowest --testr-args='{posargs}' |