openstack/kolla-ansible
Code Issues Proposed changes

Merge "Stop mocking ansible modules globally"

Browse Source
This commit is contained in:
Zuul 2020-05-12 21:31:13 +00:00 committed by Gerrit Code Review
commit c3a4f78d14
4 changed files with 2 additions and 10 deletions

1
lower-constraints.txt

@ -1,4 +1,5 @@
alabaster==0.7.10 alabaster==0.7.10
ansible==2.8.0
appdirs==1.4.3 appdirs==1.4.3
asn1crypto==0.24.0 asn1crypto==0.24.0
Babel==2.5.3 Babel==2.5.3

1
test-requirements.txt

@ -11,3 +11,4 @@ coverage!=4.4,>=4.0 # Apache-2.0
docker>=2.4.2 # Apache-2.0 docker>=2.4.2 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0
ansible>=2.8.0 # GPLv3

5
tests/test_kolla_docker.py

@ -26,11 +26,6 @@ from docker.types import Ulimit
from oslotest import base from oslotest import base
this_dir = os.path.dirname(sys.modules[__name__].__file__) this_dir = os.path.dirname(sys.modules[__name__].__file__)
# FIXME(yoctozepto): this modifies global interpreter state and affects tests
# from other files
sys.modules['ansible'] = mock.MagicMock()
sys.modules['ansible.module_utils'] = mock.MagicMock()
sys.modules['ansible.module_utils.basic'] = mock.MagicMock()
kolla_docker_file = os.path.join(this_dir, '..', 'ansible', kolla_docker_file = os.path.join(this_dir, '..', 'ansible',
'library', 'kolla_docker.py') 'library', 'kolla_docker.py')
kd = imp.load_source('kolla_docker', kolla_docker_file) kd = imp.load_source('kolla_docker', kolla_docker_file)

5
tests/test_merge_config.py

@ -15,8 +15,6 @@
import imp import imp
import os import os
import sys
from unittest import mock
from io import StringIO from io import StringIO
from oslotest import base from oslotest import base
@ -26,9 +24,6 @@ PROJECT_DIR = os.path.abspath(os.path.join(os. path.dirname(__file__), '../'))
MERGE_CONFIG_FILE = os.path.join(PROJECT_DIR, MERGE_CONFIG_FILE = os.path.join(PROJECT_DIR,
'ansible/action_plugins/merge_configs.py') 'ansible/action_plugins/merge_configs.py')
# FIXME(yoctozepto): this modifies global interpreter state and affects tests
# from other files
sys.modules['ansible.plugins'] = mock.MagicMock()
merge_configs = imp.load_source('merge_configs', MERGE_CONFIG_FILE) merge_configs = imp.load_source('merge_configs', MERGE_CONFIG_FILE)