Fix help message and incorrect test

ansible · Nov 16, 2023 · e90bd12 · e90bd12
1 parent 1558bfb
commit e90bd12
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/src/ansible_builder/cli.py b/src/ansible_builder/cli.py
@@ -154,7 +154,7 @@ def add_container_options(parser):
 
         p.add_argument('-f', '--file',
                        dest='filename',
-                       help='The definition of the execution environment (default: %(default)s)')
+                       help='The definition of the execution environment (default: execution-environment.(yml|yaml))')
 
         p.add_argument('-c', '--context',
                        default=constants.default_build_context,

diff --git a/src/ansible_builder/constants.py b/src/ansible_builder/constants.py
@@ -47,4 +47,4 @@
 FINAL_IMAGE_BIN_PATH = "/opt/builder/bin"
 
 DEFAULT_EE_BASENAME = "execution-environment"
-YAML_FILENAME_EXTENSIONS = ('yml', 'yaml)')
+YAML_FILENAME_EXTENSIONS = ('yml', 'yaml')
diff --git a/...s/ansible_collections/test_collection/test_yaml_extension/meta/execution-environment.yaml b/...s/ansible_collections/test_collection/test_yaml_extension/meta/execution-environment.yaml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-  python: requirements.txt
+  python: my-requirements.txt
diff --git a/...tion/test_yaml_extension/requirements.txt → ...n/test_yaml_extension/my-requirements.txt b/...tion/test_yaml_extension/requirements.txt → ...n/test_yaml_extension/my-requirements.txt
diff --git a/test/unit/test_introspect.py b/test/unit/test_introspect.py
@@ -72,6 +72,10 @@ def test_parse_args_default_action():
 def test_yaml_extension(data_dir):
     """
     Test that introspection recognizes a collection meta directory EE with a .yaml file extension.
+
+    NOTE: This test depends on the meta EE in the collection to reference a file other than "requirements.txt"
+    because of the way CollectionDefinition.__init__() will fall through to a default if the meta EE is not
+    found.
     """
     col_path = os.path.join(data_dir, 'alternate_collections')
     files = process(col_path)