Remove tox skipdist=True
This does not work with latest tox 4.x. Also fixes few other issues in tox.ini. This also includes I1c2289a1cff56a4f9a0ecf9aec81765e1046a4b5. Closes-Bug: #2000357 Change-Id: Ia3fe0e1de08f47ec434d04a5baae2b476132be19 (cherry picked from commit254ff2bd1c
and7759985e8d
)
This commit is contained in:
parent
6cae60300d
commit
df161e5cbe
11
tox.ini
11
tox.ini
|
@ -1,7 +1,6 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 3.18.0
|
minversion = 3.18.0
|
||||||
envlist = docs,linters
|
envlist = docs,linters
|
||||||
skipsdist = True
|
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
|
@ -50,13 +49,12 @@ deps = bindep
|
||||||
commands = bindep test
|
commands = bindep test
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
skipsdist = True
|
|
||||||
skip_install = True
|
skip_install = True
|
||||||
sitepackages = False
|
sitepackages = False
|
||||||
deps =
|
deps =
|
||||||
pre-commit
|
pre-commit
|
||||||
virtualenv
|
virtualenv
|
||||||
-r {toxinidir}/ansible-requirements.txt
|
-r {toxinidir}/ansible-requirements.txt
|
||||||
commands =
|
commands =
|
||||||
bash -c "ANSIBLE_ROLES_PATH='{toxinidir}/tripleo_ansible/roles.galaxy' \
|
bash -c "ANSIBLE_ROLES_PATH='{toxinidir}/tripleo_ansible/roles.galaxy' \
|
||||||
ansible-galaxy install -fr {toxinidir}/tripleo_ansible/requirements.yml"
|
ansible-galaxy install -fr {toxinidir}/tripleo_ansible/requirements.yml"
|
||||||
|
@ -92,8 +90,9 @@ commands = {posargs}
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
description = "[deprecated], use linters instead."
|
description = "[deprecated], use linters instead."
|
||||||
deps =
|
deps =
|
||||||
commands = true
|
{[testenv:linters]deps}
|
||||||
skipsdist = True
|
commands =
|
||||||
|
{[testenv:linters]commands}
|
||||||
skip_install = True
|
skip_install = True
|
||||||
sitepackages = False
|
sitepackages = False
|
||||||
|
|
||||||
|
@ -111,7 +110,7 @@ commands =
|
||||||
cd {toxinidir}/tripleo_ansible/roles/skeleton_test; \
|
cd {toxinidir}/tripleo_ansible/roles/skeleton_test; \
|
||||||
molecule --base-config {toxinidir}/.config/molecule/config_podman.yml test --all; \
|
molecule --base-config {toxinidir}/.config/molecule/config_podman.yml test --all; \
|
||||||
else \
|
else \
|
||||||
echo -e '\n\nNo molecule tests have been executed\nSee https://docs.openstack.org/tripleo-ansible/latest/contributing.html#local-testing-of-new-roles\n\n'; \
|
echo -e '\n\nNo molecule tests have been executed\nSee https://docs.openstack.org/tripleo-ansible/latest/contributing.html\n\n'; \
|
||||||
fi"
|
fi"
|
||||||
{[testenv:linters]commands}
|
{[testenv:linters]commands}
|
||||||
|
|
||||||
|
|
|
@ -237,8 +237,8 @@ class TestTripleoOvercloudNetworkExtract(tests_base.TestCase):
|
||||||
self.assertEqual(name, 'public_subnet')
|
self.assertEqual(name, 'public_subnet')
|
||||||
self.assertEqual(expected, subnet)
|
self.assertEqual(expected, subnet)
|
||||||
|
|
||||||
@mock.patch.object(plugin, 'get_subnet_info', auto_spec=True)
|
@mock.patch.object(plugin, 'get_subnet_info', autospec=True)
|
||||||
@mock.patch.object(plugin, 'get_network_info', auto_spec=True)
|
@mock.patch.object(plugin, 'get_network_info', autospec=True)
|
||||||
@mock.patch.object(openstack.connection, 'Connection', autospec=True)
|
@mock.patch.object(openstack.connection, 'Connection', autospec=True)
|
||||||
def test_parse_net_resources(self, conn_mock, mock_get_network,
|
def test_parse_net_resources(self, conn_mock, mock_get_network,
|
||||||
mock_get_subnet):
|
mock_get_subnet):
|
||||||
|
|
Loading…
Reference in New Issue