diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-04-17 17:30:28 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-04-26 12:16:44 +0200 |
| commit | 234272eb646ce877043ec486bbcf6fe2dcb7e3b4 (patch) | |
| tree | dbfe6c885c80c23c5ee248be34969bf334ded0f4 /tests/test_merge_config.py | |
| parent | b1db4f5c3bc14d4e9a501c32fb73a2bf2aa2a37e (diff) | |
| download | kolla-ansible-234272eb646ce877043ec486bbcf6fe2dcb7e3b4.tar.gz kolla-ansible-234272eb646ce877043ec486bbcf6fe2dcb7e3b4.zip | |
Cleanup py27 support
Removes and/or replaces all mentions of py27.
Cleans up obsolete requirements and their lower-constraints.
Separates test-requirements.
Makes lower-constraints pass outside of CI (MarkupSafe).
Adds FIXMEs about some hacky Mocks that may misbehave.
Change-Id: Ifc090bf3c1db17d8542ee591c91e8225a597bfe2
Diffstat (limited to 'tests/test_merge_config.py')
| -rw-r--r-- | tests/test_merge_config.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/test_merge_config.py b/tests/test_merge_config.py index ccc702947..1638186f5 100644 --- a/tests/test_merge_config.py +++ b/tests/test_merge_config.py @@ -26,6 +26,8 @@ PROJECT_DIR = os.path.abspath(os.path.join(os. path.dirname(__file__), '../')) MERGE_CONFIG_FILE = os.path.join(PROJECT_DIR, '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) |