Merge "Fix ipv6 test and pytest collection"

This commit is contained in:
Zuul 2019-08-30 23:35:23 +00:00 committed by Gerrit Code Review
commit b5d8a7376e
2 changed files with 2 additions and 1 deletions

View File

@ -160,7 +160,7 @@ mistral.actions =
tripleo.role.list = tripleo_common.actions.plan:ListRolesAction
[tool:pytest]
norecursedirs = .git .tox dist
norecursedirs = .eggs .git .tox dist
log_cli = true
[flake8]

View File

@ -113,6 +113,7 @@ class TestImageUploadManager(base.TestCase):
@mock.patch('netifaces.ifaddresses')
@mock.patch('netifaces.interfaces')
@mock.patch('netifaces.AF_INET6', 10)
def test_get_undercloud_registry_ipv6(self, mock_interfaces,
mock_addresses):