summaryrefslogtreecommitdiffstats
path: root/test/units/galaxy
diff options
context:
space:
mode:
authorMatt Martz <matt@sivel.net>2022-08-18 01:01:46 +0200
committerGitHub <noreply@github.com>2022-08-18 01:01:46 +0200
commitdeb54e4c5b32a346f1f0b0a14f1c713d2cc2e961 (patch)
treee654f903bff64f5f23491838590ae5a7bcc7b5fe /test/units/galaxy
parentFix incorrect docs about how to enable manifest functionality (#78572) (diff)
downloadansible-deb54e4c5b32a346f1f0b0a14f1c713d2cc2e961.tar.xz
ansible-deb54e4c5b32a346f1f0b0a14f1c713d2cc2e961.zip
Relax minimal config to enable manifest functionality (#78574)
* Revert "Fix incorrect docs about how to enable manifest functionality (#78572)" This reverts commit ac1ca40fb3ed0a0fce387ae70cb8937208a13e03.
Diffstat (limited to 'test/units/galaxy')
-rw-r--r--test/units/galaxy/test_collection.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/units/galaxy/test_collection.py b/test/units/galaxy/test_collection.py
index 211e5673a7..28a69b2814 100644
--- a/test/units/galaxy/test_collection.py
+++ b/test/units/galaxy/test_collection.py
@@ -28,6 +28,7 @@ from ansible.module_utils.six.moves import builtins
from ansible.utils import context_objects as co
from ansible.utils.display import Display
from ansible.utils.hashing import secure_hash_s
+from ansible.utils.sentinel import Sentinel
@pytest.fixture(autouse='function')
@@ -595,7 +596,7 @@ def test_build_ignore_files_and_folders(collection_input, monkeypatch):
tests_file.write('random')
tests_file.flush()
- actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection', [], {})
+ actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection', [], Sentinel)
assert actual['format'] == 1
for manifest_entry in actual['files']:
@@ -631,7 +632,7 @@ def test_build_ignore_older_release_in_root(collection_input, monkeypatch):
file_obj.write('random')
file_obj.flush()
- actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection', [], {})
+ actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection', [], Sentinel)
assert actual['format'] == 1
plugin_release_found = False
@@ -659,7 +660,7 @@ def test_build_ignore_patterns(collection_input, monkeypatch):
actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection',
['*.md', 'plugins/action', 'playbooks/*.j2'],
- {})
+ Sentinel)
assert actual['format'] == 1
expected_missing = [
@@ -710,7 +711,7 @@ def test_build_ignore_symlink_target_outside_collection(collection_input, monkey
link_path = os.path.join(input_dir, 'plugins', 'connection')
os.symlink(outside_dir, link_path)
- actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection', [], {})
+ actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection', [], Sentinel)
for manifest_entry in actual['files']:
assert manifest_entry['name'] != 'plugins/connection'
@@ -734,7 +735,7 @@ def test_build_copy_symlink_target_inside_collection(collection_input):
os.symlink(roles_target, roles_link)
- actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection', [], {})
+ actual = collection._build_files_manifest(to_bytes(input_dir), 'namespace', 'collection', [], Sentinel)
linked_entries = [e for e in actual['files'] if e['name'].startswith('playbooks/roles/linked')]
assert len(linked_entries) == 1