From 30fdf8864918833b3bf3836372d01f4a5fe2c1ba Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Thu, 11 Jul 2024 15:37:36 +0530 Subject: [PATCH 01/12] Adopt community-ansible-dev-tools image --- src/ansible_navigator/data/images_dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ansible_navigator/data/images_dockerfile b/src/ansible_navigator/data/images_dockerfile index b725f8301..466e2fb11 100644 --- a/src/ansible_navigator/data/images_dockerfile +++ b/src/ansible_navigator/data/images_dockerfile @@ -1,7 +1,7 @@ # This file is structured like a multi stage build # The names ('as') need to correspond the the ImageEntry enum in utils/package_data.py -FROM ghcr.io/ansible/creator-ee:v24.2.0 as DEFAULT_EE +FROM ghcr.io/ansible/community-ansible-dev-tools:latest as DEFAULT_EE # This is also hard coded in tests/fixtures/integration/execution_environment_image/ansible-navigator_set_ee_image.yml FROM ghcr.io/ansible/creator-base:latest as SMALL_IMAGE From 4a7c190ffd334d626bc62e55c5d5da440a26645b Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Thu, 11 Jul 2024 17:25:04 +0530 Subject: [PATCH 02/12] Update test fixtures --- .../images/test_direct_interactive_ee.py/test/0.json | 4 ++-- .../images/test_direct_interactive_ee.py/test/1.json | 8 ++++---- .../images/test_direct_interactive_noee.py/test/0.json | 4 ++-- .../images/test_direct_interactive_noee.py/test/1.json | 8 ++++---- .../actions/images/test_stdout_tmux.py/test/0.json | 10 +++++----- .../actions/images/test_stdout_tmux.py/test/1.json | 6 +++--- .../actions/images/test_stdout_tmux.py/test/2.json | 6 +++--- .../actions/images/test_stdout_tmux.py/test/4.json | 10 +++++----- .../images/test_welcome_interactive_ee.py/test/1.json | 4 ++-- .../images/test_welcome_interactive_ee.py/test/2.json | 8 ++++---- .../test_welcome_interactive_noee.py/test/1.json | 4 ++-- .../test_welcome_interactive_noee.py/test/2.json | 8 ++++---- .../settings/test_direct_interactive_ee.py/test/5.json | 2 +- .../settings/test_direct_interactive_ee.py/test/6.json | 6 +++--- .../settings/test_direct_interactive_ee.py/test/7.json | 2 +- .../test_direct_interactive_noee.py/test/5.json | 2 +- .../test_direct_interactive_noee.py/test/6.json | 6 +++--- .../test_direct_interactive_noee.py/test/7.json | 2 +- .../test_welcome_interactive_ee.py/test/6.json | 2 +- .../test_welcome_interactive_ee.py/test/7.json | 6 +++--- .../test_welcome_interactive_ee.py/test/8.json | 2 +- .../test_welcome_interactive_noee.py/test/6.json | 2 +- .../test_welcome_interactive_noee.py/test/7.json | 6 +++--- .../test_welcome_interactive_noee.py/test/8.json | 2 +- tests/fixtures/unit/cli/ansible-navigator.yml | 2 +- tests/integration/actions/images/test_stdout_tmux.py | 6 +++--- tests/unit/test_cli.py | 2 +- 27 files changed, 65 insertions(+), 65 deletions(-) diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/0.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/0.json index 7eb4c414e..6cf1b415f 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/0.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/0.json @@ -4,7 +4,7 @@ "comment": "ansible-navigator images top window", "additional_information": { "present": [ - "v24.2.0" + "community-ansible-dev-tools" ], "absent": [], "compared_fixture": false @@ -12,7 +12,7 @@ "output": [ " Image Tag Execution environment Created Size", "0│creator-base latest False some time ago 341 MB", - "1│creator-ee v24.2.0 True 5 weeks ago 686 MB", + "1│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json index 6bbd13597..68e13e542 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json @@ -1,17 +1,17 @@ { - "name": "test[01-:f v24.2.0-filter for v24.2.0]", + "name": "test[01-:f community-ansible-dev-tools-filter for community-ansible-dev-tools]", "index": 1, - "comment": "filter for v24.2.0", + "comment": "filter for community-ansible-dev-tools", "additional_information": { "present": [ - "v24.2.0" + "latest" ], "absent": [], "compared_fixture": false }, "output": [ " Image Tag Execution environment Created Size", - "0│creator-ee v24.2.0 True 5 weeks ago 686 MB", + "0│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/0.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/0.json index 30392929c..abe1599be 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/0.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/0.json @@ -4,7 +4,7 @@ "comment": "ansible-navigator images top window", "additional_information": { "present": [ - "v24.2.0" + "community-ansible-dev-tools" ], "absent": [], "compared_fixture": false @@ -12,7 +12,7 @@ "output": [ " Image Tag Execution environment Created Size", "0│creator-base latest False some time ago 341 MB", - "1│creator-ee v24.2.0 True 5 weeks ago 686 MB", + "1│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/1.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/1.json index 6bbd13597..68e13e542 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/1.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/1.json @@ -1,17 +1,17 @@ { - "name": "test[01-:f v24.2.0-filter for v24.2.0]", + "name": "test[01-:f community-ansible-dev-tools-filter for community-ansible-dev-tools]", "index": 1, - "comment": "filter for v24.2.0", + "comment": "filter for community-ansible-dev-tools", "additional_information": { "present": [ - "v24.2.0" + "latest" ], "absent": [], "compared_fixture": false }, "output": [ " Image Tag Execution environment Created Size", - "0│creator-ee v24.2.0 True 5 weeks ago 686 MB", + "0│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/0.json b/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/0.json index 95f03f15a..54e0054f3 100644 --- a/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/0.json +++ b/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/0.json @@ -1,10 +1,10 @@ { - "name": "test[clear-&&-ansible-navigator-images---ee-true---ll-debug---mode-stdout--|-grep-creator-print-image-to-stdout-['repository:-ghcr.io/ansible/creator-ee']-[]-true-0-search-for-help]", + "name": "test[clear-&&-ansible-navigator-images---ee-true---ll-debug---mode-stdout--|-grep-community-print-image-to-stdout-['repository:-ghcr.io/ansible/community-ansible-dev-tools']-[]-true-0-search-for-help]", "index": 0, "comment": "print image to stdout", "additional_information": { "present": [ - "repository: ghcr.io/ansible/creator-ee" + "repository: ghcr.io/ansible/community-ansible-dev-tools" ], "absent": [], "compared_fixture": false @@ -26,9 +26,9 @@ " - ghcr.io/ansible/creator-ee@sha256:39fd2060b7fb2f987835057e50a9ee1c1290d525e43aafbdcd1461f76c46a770", " - ghcr.io/ansible/creator-ee@sha256:de0ae709f909b17e5f5f8ca5e1656ee427e2a01c7e1e74be314dc989edf47a49", " - ghcr.io/ansible/creator-ee:v24.2.0", - " name: creator-ee", - " name_tag: creator-ee:v24.2.0(primary)", - " repository: ghcr.io/ansible/creator-ee", + " name: community-ansible-dev-tools", + " name_tag: community-ansible-dev-tools:latest (primary)", + " repository: ghcr.io/ansible/community-ansible-dev-tools", "(venv) bash$" ] } diff --git a/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/1.json b/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/1.json index 1478ee0f2..b6c7632b4 100644 --- a/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/1.json +++ b/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/1.json @@ -1,12 +1,12 @@ { - "name": "test[clear-&&-ansible-navigator-images---details---display-color-false---ee-true---ll-debug---mode-stdout--|-grep-'^[a-z]'-print-all-details-to-stdout-['ansible_collections',-'ansible_version',-'image_name:-ghcr.io/ansible/creator-ee:v24.2.0',-'os_release',-'python_packages',-'python_version',-'redhat_release',-'system_packages']-[]-true-1-search-for-help]", + "name": "test[clear-&&-ansible-navigator-images---details---display-color-false---ee-true---ll-debug---mode-stdout--|-grep-'^[a-z]'-print-all-details-to-stdout-['ansible_collections',-'ansible_version',-'image_name:-ghcr.io/ansible/community-ansible-dev-tools:latest',-'os_release',-'python_packages',-'python_version',-'redhat_release',-'system_packages']-[]-true-1-search-for-help]", "index": 1, "comment": "print all details to stdout", "additional_information": { "present": [ "ansible_collections", "ansible_version", - "image_name: ghcr.io/ansible/creator-ee:v24.2.0", + "image_name: ghcr.io/ansible/community-ansible-dev-tools:latest", "os_release", "python_packages", "python_version", @@ -19,7 +19,7 @@ "output": [ "ansible_collections:", "ansible_version:", - "image_name: ghcr.io/ansible/creator-ee:v24.2.0", + "image_name: ghcr.io/ansible/community-ansible-dev-tools:latest", "os_release:", "python_packages:", "python_version:", diff --git a/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/2.json b/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/2.json index d766fc9af..9e12843a6 100644 --- a/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/2.json +++ b/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/2.json @@ -1,12 +1,12 @@ { - "name": "test[clear-&&-ansible-navigator-images--d-ansible_collections--d-ansible_version---display-color-false---ee-true---ll-debug---mode-stdout--|-grep-'^[a-z]'-print-all-details-to-stdout-['ansible_collections',-'ansible_version',-'image_name:-ghcr.io/ansible/creator-ee:v24.2.0']-['os_release',-'python_packages',-'python_version',-'redhat_release',-'system_packages']-true-2-search-for-help]", + "name": "test[clear-&&-ansible-navigator-images--d-ansible_collections--d-ansible_version---display-color-false---ee-true---ll-debug---mode-stdout--|-grep-'^[a-z]'-print-all-details-to-stdout-['ansible_collections',-'ansible_version',-'image_name:-ghcr.io/ansible/community-ansible-dev-tools:latest']-['os_release',-'python_packages',-'python_version',-'redhat_release',-'system_packages']-true-2-search-for-help]", "index": 2, "comment": "print all details to stdout", "additional_information": { "present": [ "ansible_collections", "ansible_version", - "image_name: ghcr.io/ansible/creator-ee:v24.2.0" + "image_name: ghcr.io/ansible/community-ansible-dev-tools:latest" ], "absent": [ "os_release", @@ -20,7 +20,7 @@ "output": [ "ansible_collections:", "ansible_version:", - "image_name: ghcr.io/ansible/creator-ee:v24.2.0", + "image_name: ghcr.io/ansible/community-ansible-dev-tools:latest", "(venv) bash$" ] } diff --git a/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/4.json b/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/4.json index a46e1ffda..2730d51f3 100644 --- a/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/4.json +++ b/tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/4.json @@ -1,10 +1,10 @@ { - "name": "test[clear-&&-ansible-navigator-images---ee-true---ll-debug---mode-stdout---format-json--|-grep-creator-print-image-details-as-json-output-['\"name\":-\"creator-ee\"']-[]-true-4-search-for-help]", + "name": "test[clear-&&-ansible-navigator-images---ee-true---ll-debug---mode-stdout---format-json--|-grep-community-print-image-details-as-json-output-['\"name\":-\"community-ansible-dev-tools\"']-[]-true-4-search-for-help]", "index": 4, "comment": "print image details as json output", "additional_information": { "present": [ - "\"name\": \"creator-ee\"" + "\"name\": \"community-ansible-dev-tools\"" ], "absent": [], "compared_fixture": false @@ -26,9 +26,9 @@ " \"ghcr.io/ansible/creator-ee@sha256:39fd2060b7fb2f987835057e50a9ee1c1290d525e43aafbdcd1461f76c46a770\",", " \"ghcr.io/ansible/creator-ee@sha256:de0ae709f909b17e5f5f8ca5e1656ee427e2a01c7e1e74be314dc989edf47a49\"", " \"ghcr.io/ansible/creator-ee:v24.2.0\"", - " \"name\": \"creator-ee\",", - " \"name_tag\": \"creator-ee:v24.2.0 (primary)\",", - " \"repository\": \"ghcr.io/ansible/creator-ee\",", + " \"name\": \"community-ansible-dev-tools\",", + " \"name_tag\": \"community-ansible-dev-tools:latest (primary)\",", + " \"repository\": \"ghcr.io/ansible/community-ansible-dev-tools\",", "(venv) bash$" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/1.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/1.json index 471341277..d9be17c5c 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/1.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/1.json @@ -4,7 +4,7 @@ "comment": "ansible-navigator images top window", "additional_information": { "present": [ - "v24.2.0" + "community-ansible-dev-tools" ], "absent": [], "compared_fixture": false @@ -12,7 +12,7 @@ "output": [ " Image Tag Execution environment Created Size", "0│creator-base latest False some time ago 341 MB", - "1│creator-ee v24.2.0 True 5 weeks ago 686 MB", + "1│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json index 348028d5b..957798ac6 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json @@ -1,17 +1,17 @@ { - "name": "test[02-:f v24.2.0-filter for v24.2.0]", + "name": "test[02-:f community-ansible-dev-tools-filter for community-ansible-dev-tools]", "index": 2, - "comment": "filter for v24.2.0", + "comment": "filter for community-ansible-dev-tools", "additional_information": { "present": [ - "v24.2.0" + "latest" ], "absent": [], "compared_fixture": false }, "output": [ " Image Tag Execution environment Created Size", - "0│creator-ee v24.2.0 True 5 weeks ago 686 MB", + "0│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/1.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/1.json index 471341277..02642eb2f 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/1.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/1.json @@ -4,7 +4,7 @@ "comment": "ansible-navigator images top window", "additional_information": { "present": [ - "v24.2.0" + "community-ansible-dev-tools" ], "absent": [], "compared_fixture": false @@ -12,7 +12,7 @@ "output": [ " Image Tag Execution environment Created Size", "0│creator-base latest False some time ago 341 MB", - "1│creator-ee v24.2.0 True 5 weeks ago 686 MB", + "1│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json index 348028d5b..957798ac6 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json @@ -1,17 +1,17 @@ { - "name": "test[02-:f v24.2.0-filter for v24.2.0]", + "name": "test[02-:f community-ansible-dev-tools-filter for community-ansible-dev-tools]", "index": 2, - "comment": "filter for v24.2.0", + "comment": "filter for community-ansible-dev-tools", "additional_information": { "present": [ - "v24.2.0" + "latest" ], "absent": [], "compared_fixture": false }, "output": [ " Image Tag Execution environment Created Size", - "0│creator-ee v24.2.0 True 5 weeks ago 686 MB", + "0│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json index 860c8c84a..aba435277 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json @@ -12,7 +12,7 @@ "0│Exec command True Defaults /bin/bash", "1│Exec shell True Defaults True", "2│Execution environment True Command line True", - "3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json index 192e6b392..7b953906a 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json @@ -8,16 +8,16 @@ "compared_fixture": true }, "output": [ - "Execution environment image (current value/default value: ghcr.io/ansible/creator-ee:v24.2.0)", + "Execution environment image (current value/default value: ghcr.io/ansible/community-ansible-dev-tools:latest)", " 0│--- ▒", " 1│choices: [] ▒", " 2│cli_parameters: ▒", " 3│ long: --execution-environment-image ▒", " 4│ short: --eei ▒", " 5│current_settings_file: None ▒", - " 6│current_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒", + " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 7│default: true ▒", - " 8│default_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒", + " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 9│description: Specify the name of the execution environment image ▒", "10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒", "11│name: Execution environment image ▒", diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json index 5bbd3aaf9..44a4a1a20 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json @@ -12,7 +12,7 @@ "0│Exec command True Defaults /bin/bash", "1│Exec shell True Defaults True", "2│Execution environment True Command line True", - "3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json index 2ffcb2885..576780a03 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json @@ -12,7 +12,7 @@ "0│Exec command True Defaults /bin/bash", "1│Exec shell True Defaults True", "2│Execution environment False Command line False", - "3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/6.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/6.json index 192e6b392..7b953906a 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/6.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/6.json @@ -8,16 +8,16 @@ "compared_fixture": true }, "output": [ - "Execution environment image (current value/default value: ghcr.io/ansible/creator-ee:v24.2.0)", + "Execution environment image (current value/default value: ghcr.io/ansible/community-ansible-dev-tools:latest)", " 0│--- ▒", " 1│choices: [] ▒", " 2│cli_parameters: ▒", " 3│ long: --execution-environment-image ▒", " 4│ short: --eei ▒", " 5│current_settings_file: None ▒", - " 6│current_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒", + " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 7│default: true ▒", - " 8│default_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒", + " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 9│description: Specify the name of the execution environment image ▒", "10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒", "11│name: Execution environment image ▒", diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/7.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/7.json index 0da56d600..793adbbe9 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/7.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/7.json @@ -12,7 +12,7 @@ "0│Exec command True Defaults /bin/bash", "1│Exec shell True Defaults True", "2│Execution environment False Command line False", - "3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/6.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/6.json index 32fdf3ac0..9071db0ab 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/6.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/6.json @@ -12,7 +12,7 @@ "0│Exec command True Defaults /bin/bash", "1│Exec shell True Defaults True", "2│Execution environment True Command line True", - "3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/7.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/7.json index abdfdcf57..dffa9cee5 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/7.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/7.json @@ -8,16 +8,16 @@ "compared_fixture": true }, "output": [ - "Execution environment image (current value/default value: ghcr.io/ansible/creator-ee:v24.2.0)", + "Execution environment image (current value/default value: ghcr.io/ansible/community-ansible-dev-tools:latest)", " 0│--- ▒", " 1│choices: [] ▒", " 2│cli_parameters: ▒", " 3│ long: --execution-environment-image ▒", " 4│ short: --eei ▒", " 5│current_settings_file: None ▒", - " 6│current_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒", + " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 7│default: true ▒", - " 8│default_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒", + " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 9│description: Specify the name of the execution environment image ▒", "10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒", "11│name: Execution environment image ▒", diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/8.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/8.json index cd0229273..875417eee 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/8.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/8.json @@ -12,7 +12,7 @@ "0│Exec command True Defaults /bin/bash", "1│Exec shell True Defaults True", "2│Execution environment True Command line True", - "3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/6.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/6.json index ee8e2a6cc..4ba219a8a 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/6.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/6.json @@ -12,7 +12,7 @@ "0│Exec command True Defaults /bin/bash", "1│Exec shell True Defaults True", "2│Execution environment False Command line False", - "3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/7.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/7.json index abdfdcf57..dffa9cee5 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/7.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/7.json @@ -8,16 +8,16 @@ "compared_fixture": true }, "output": [ - "Execution environment image (current value/default value: ghcr.io/ansible/creator-ee:v24.2.0)", + "Execution environment image (current value/default value: ghcr.io/ansible/community-ansible-dev-tools:latest)", " 0│--- ▒", " 1│choices: [] ▒", " 2│cli_parameters: ▒", " 3│ long: --execution-environment-image ▒", " 4│ short: --eei ▒", " 5│current_settings_file: None ▒", - " 6│current_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒", + " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 7│default: true ▒", - " 8│default_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒", + " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 9│description: Specify the name of the execution environment image ▒", "10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒", "11│name: Execution environment image ▒", diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/8.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/8.json index e54844433..ac3e42f14 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/8.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/8.json @@ -12,7 +12,7 @@ "0│Exec command True Defaults /bin/bash", "1│Exec shell True Defaults True", "2│Execution environment False Command line False", - "3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] diff --git a/tests/fixtures/unit/cli/ansible-navigator.yml b/tests/fixtures/unit/cli/ansible-navigator.yml index 13b5de030..6b503b3da 100644 --- a/tests/fixtures/unit/cli/ansible-navigator.yml +++ b/tests/fixtures/unit/cli/ansible-navigator.yml @@ -10,7 +10,7 @@ ansible-navigator: execution-environment: container-engine: podman enabled: False - image: quay.io/ansible/creator-ee:v0.9.2 + image: ghcr.io/ansible/community-ansible-dev-tools:latest inventory-columns: - ansible_network_os - ansible_network_cli_ssh_type diff --git a/tests/integration/actions/images/test_stdout_tmux.py b/tests/integration/actions/images/test_stdout_tmux.py index 9ebf8f3fb..5a5adb498 100644 --- a/tests/integration/actions/images/test_stdout_tmux.py +++ b/tests/integration/actions/images/test_stdout_tmux.py @@ -32,7 +32,7 @@ class ShellCommand(UiTestStep): cmdline="", mode="stdout", execution_environment=True, - raw_append=" | grep creator", + raw_append=" | grep community", ).join(), present=[f"repository: {IMAGE_NO_VERSION}"], ), @@ -94,9 +94,9 @@ class ShellCommand(UiTestStep): mode="stdout", format_="json", execution_environment=True, - raw_append=" | grep creator", + raw_append=" | grep community", ).join(), - present=['"name": "creator-ee"'], + present=['"name": "community-ansible-dev-tools"'], ), ) diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py index 60df89206..a88f48835 100644 --- a/tests/unit/test_cli.py +++ b/tests/unit/test_cli.py @@ -43,7 +43,7 @@ pytest.param( ["config"], "execution_environment_image", - "quay.io/ansible/creator-ee:v0.9.2", + "ghcr.io/ansible/community-ansible-dev-tools:latest", id="internal-default-value-gets-picked-if-not-overridden", ), pytest.param( From c60e6ef149cb7fdc7efa972fd8d71d48ad64890b Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Fri, 12 Jul 2024 15:24:23 +0530 Subject: [PATCH 03/12] Fix test_direct_interactive_ee for images --- .../test_direct_interactive_ee.py/test/1.json | 4 +-- .../test/10.json | 32 +++++++++++------ .../test/11.json | 32 ++++++----------- .../test/12.json | 32 +++++++++++------ .../test/13.json | 34 ++++++------------- .../test/14.json | 34 +++++++++++++++++++ .../test_direct_interactive_ee.py/test/2.json | 15 +++----- .../test_direct_interactive_ee.py/test/3.json | 34 ++++++------------- .../test_direct_interactive_ee.py/test/4.json | 34 +++++++++++++------ .../test_direct_interactive_ee.py/test/5.json | 34 ++++++------------- .../test_direct_interactive_ee.py/test/6.json | 34 +++++++++++++------ .../test_direct_interactive_ee.py/test/7.json | 29 ++++++---------- .../test_direct_interactive_ee.py/test/8.json | 29 ++++++++++------ .../test_direct_interactive_ee.py/test/9.json | 32 ++++++----------- tests/integration/actions/images/base.py | 5 +++ .../images/test_direct_interactive_ee.py | 3 +- 16 files changed, 219 insertions(+), 198 deletions(-) create mode 100644 tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/14.json diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json index 68e13e542..dabad9c31 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json @@ -1,7 +1,7 @@ { - "name": "test[01-:f community-ansible-dev-tools-filter for community-ansible-dev-tools]", + "name": "test[01-:f latest-filter for latest]", "index": 1, - "comment": "filter for community-ansible-dev-tools", + "comment": "filter for latest", "additional_information": { "present": [ "latest" diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/10.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/10.json index 1ddca4d0a..23a9d93bf 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/10.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/10.json @@ -1,22 +1,34 @@ { - "name": "test[10-:back-goto info menu]", + "name": "test[10-:3-goto Python information]", "index": 10, - "comment": "goto info menu", + "comment": "goto Python information", "additional_information": { "present": [ - "Everything" + "ansible-runner" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Name Version Summary", + " 0│ansible-compat 3.0.1 Ansible compatibility goodies ▒", + " 1│ansible-core 2.14.1 Radically simple IT automation ▒", + " 2│ansible-lint 6.12.2 Checks playbooks for practices and behavior that could potentially be improved ▒", + " 3│ansible-runner 2.3.1 \"Consistent Ansible Python API and CLI with container and process isolation runtime capabilities ▒", + " 4│arrow 1.2.3 Better dates & times for Python ▒", + " 5│attrs 22.2.0 Classes Without Boilerplate ▒", + " 6│bcrypt 3.2.2 Modern password hashing for your software and your servers", + " 7│binaryornot 0.4.4 Ultra-lightweight pure Python package to check if a file is binary or text.", + " 8│black 22.12.0 The uncompromising code formatter.", + " 9│bracex 2.3.post1 Bash style brace expander.", + "10│certifi 2022.12.7 Python package for providing Mozilla's CA Bundle.", + "11│cffi 1.15.1 Foreign Function Interface for Python calling C code.", + "12│chardet 5.1.0 Universal encoding detector for Python 3", + "13│charset-normalizer 3.0.1 The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.", + "14│click 8.1.3 Composable command line interface toolkit", + "15│click-help-colors 0.9.1 Colorization of help messages in Click", + "16│cookiecutter 2.1.1 A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template.", + "17│cryptography 39.0.1 cryptography is a package which provides cryptographic recipes and primitives to Python developers.", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/11.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/11.json index 19d96474e..f2dfb9b6b 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/11.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/11.json @@ -1,34 +1,22 @@ { - "name": "test[11-:4-goto System information]", + "name": "test[11-:back-goto info menu]", "index": 11, - "comment": "goto System information", + "comment": "goto info menu", "additional_information": { "present": [ - "basesystem" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - " Name Version Summary", - " 0│aardvark-dns 1.4.0 Authoritative DNS server for A/AAAA container records ▒", - " 1│alternatives 1.21 A tool to maintain symbolic links determining default commands ▒", - " 2│audit-libs 3.0.9 Dynamic library for libaudit", - " 3│authselect 1.4.2 Configures authentication and identity sources from supported profiles", - " 4│authselect-libs 1.4.2 Utility library used by the authselect tool", - " 5│basesystem 11 The skeleton package which defines a simple Fedora system", - " 6│bash 5.2.15 The GNU Bourne Again shell", - " 7│bzip2-libs 1.0.8 Libraries for applications using bzip2", - " 8│ca-certificates 2023.2.60 The Mozilla CA root certificate bundle", - " 9│catatonit 0.1.7 A signal-forwarding process manager for containers", - " 10│conmon 2.1.5 OCI container runtime monitor", - " 11│containers-common 1 Common configuration and documentation for containers", - " 12│containers-common-extra 1 Extra dependencies for Podman and Buildah", - " 13│coreutils 9.1 A set of basic GNU tools commonly used in shell scripts", - " 14│coreutils-common 9.1 coreutils common optional components", - " 15│cracklib 2.9.7 A password-checking library", - " 16│cracklib-dicts 2.9.7 The standard CrackLib dictionaries", - " 17│criu 3.17.1 Tool for Checkpoint/Restore in User-space", + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/12.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/12.json index 15311e4a0..8b16e8c2d 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/12.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/12.json @@ -1,22 +1,34 @@ { - "name": "test[12-:back-goto info menu]", + "name": "test[12-:4-goto System information]", "index": 12, - "comment": "goto info menu", + "comment": "goto System information", "additional_information": { "present": [ - "Everything" + "basesystem" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Name Version Summary", + " 0│aardvark-dns 1.4.0 Authoritative DNS server for A/AAAA container records ▒", + " 1│alternatives 1.21 A tool to maintain symbolic links determining default commands ▒", + " 2│audit-libs 3.0.9 Dynamic library for libaudit", + " 3│authselect 1.4.2 Configures authentication and identity sources from supported profiles", + " 4│authselect-libs 1.4.2 Utility library used by the authselect tool", + " 5│basesystem 11 The skeleton package which defines a simple Fedora system", + " 6│bash 5.2.15 The GNU Bourne Again shell", + " 7│bzip2-libs 1.0.8 Libraries for applications using bzip2", + " 8│ca-certificates 2023.2.60 The Mozilla CA root certificate bundle", + " 9│catatonit 0.1.7 A signal-forwarding process manager for containers", + " 10│conmon 2.1.5 OCI container runtime monitor", + " 11│containers-common 1 Common configuration and documentation for containers", + " 12│containers-common-extra 1 Extra dependencies for Podman and Buildah", + " 13│coreutils 9.1 A set of basic GNU tools commonly used in shell scripts", + " 14│coreutils-common 9.1 coreutils common optional components", + " 15│cracklib 2.9.7 A password-checking library", + " 16│cracklib-dicts 2.9.7 The standard CrackLib dictionaries", + " 17│criu 3.17.1 Tool for Checkpoint/Restore in User-space", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/13.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/13.json index 40a96127c..411ecb1fc 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/13.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/13.json @@ -1,34 +1,22 @@ { - "name": "test[13-:5-goto Everything]", + "name": "test[13-:back-goto info menu]", "index": 13, - "comment": "goto Everything", + "comment": "goto info menu", "additional_information": { "present": [ - "collections:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (All image information)", - " 0│--- ▒", - " 1│ansible:", - " 2│ ansible:", - " 3│ collections:", - " 4│ details:", - " 5│ ansible.posix: 1.5.1", - " 6│ ansible.windows: 1.13.0", - " 7│ awx.awx: 21.11.0", - " 8│ containers.podman: 1.10.1", - " 9│ kubernetes.core: 2.4.0", - " 10│ redhatinsights.insights: 1.0.7", - " 11│ theforeman.foreman: 3.8.0", - " 12│ version:", - " 13│ details: ansible [core 2.14.1]", - " 14│created: 5 weeks ago", - " 15│execution_environment: true", - " 16│general:", - " 17│ friendly:", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/14.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/14.json new file mode 100644 index 000000000..0795b7130 --- /dev/null +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/14.json @@ -0,0 +1,34 @@ +{ + "name": "test[14-:5-goto Everything]", + "index": 14, + "comment": "goto Everything", + "additional_information": { + "present": [ + "collections:" + ], + "absent": [], + "compared_fixture": false + }, + "output": [ + "Image: creator-ee:v24.2.0 (primary) (All image information)", + " 0│--- ▒", + " 1│ansible:", + " 2│ ansible:", + " 3│ collections:", + " 4│ details:", + " 5│ ansible.posix: 1.5.1", + " 6│ ansible.windows: 1.13.0", + " 7│ awx.awx: 21.11.0", + " 8│ containers.podman: 1.10.1", + " 9│ kubernetes.core: 2.4.0", + " 10│ redhatinsights.insights: 1.0.7", + " 11│ theforeman.foreman: 3.8.0", + " 12│ version:", + " 13│ details: ansible [core 2.14.1]", + " 14│created: 5 weeks ago", + " 15│execution_environment: true", + " 16│general:", + " 17│ friendly:", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + ] +} diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/2.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/2.json index 4e7234e72..89a418c1b 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/2.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/2.json @@ -1,22 +1,17 @@ { - "name": "test[02-:0-goto info menu]", + "name": "test[02-:f community-filter for community]", "index": 2, - "comment": "goto info menu", + "comment": "filter for community", "additional_information": { "present": [ - "Everything" + "community" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Image Tag Execution environment Created Size", + "0│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/3.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/3.json index 264b6565f..5ad4c41e6 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/3.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/3.json @@ -1,34 +1,22 @@ { - "name": "test[03-:0-goto Image information]", + "name": "test[03-:0-goto info menu]", "index": 3, - "comment": "goto Image information", + "comment": "goto info menu", "additional_information": { "present": [ - "architecture:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (Information collected from image inspection)", - " 0│--- ▒", - " 1│details: ▒", - " 2│ annotations: {}", - " 3│ architecture: amd64", - " 4│ author: ''", - " 5│ comment: Created by Image Factory", - " 6│ config:", - " 7│ entrypoint:", - " 8│ - entrypoint", - " 9│ env:", - " 10│ - DISTTAG=f37container", - " 11│ - FGC=f37", - " 12│ - container=oci", - " 13│ - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", - " 14│ - CONTAINER_NAME=creator-ee:v24.2.0", - " 15│ labels:", - " 16│ ansible-execution-environment: 'true'", - " 17│ io.buildah.version: 1.23.1", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/4.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/4.json index 663799702..b130b6cd4 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/4.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/4.json @@ -1,22 +1,34 @@ { - "name": "test[04-:back-goto info menu]", + "name": "test[04-:0-goto Image information]", "index": 4, - "comment": "goto info menu", + "comment": "goto Image information", "additional_information": { "present": [ - "Everything" + "architecture:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (Information collected from image inspection)", + " 0│--- ▒", + " 1│details: ▒", + " 2│ annotations: {}", + " 3│ architecture: amd64", + " 4│ author: ''", + " 5│ comment: Created by Image Factory", + " 6│ config:", + " 7│ entrypoint:", + " 8│ - entrypoint", + " 9│ env:", + " 10│ - DISTTAG=f37container", + " 11│ - FGC=f37", + " 12│ - container=oci", + " 13│ - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + " 14│ - CONTAINER_NAME=creator-ee:v24.2.0", + " 15│ labels:", + " 16│ ansible-execution-environment: 'true'", + " 17│ io.buildah.version: 1.23.1", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/5.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/5.json index 8675e1349..a63ba85bb 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/5.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/5.json @@ -1,34 +1,22 @@ { - "name": "test[05-:1-goto General information]", + "name": "test[05-:back-goto info menu]", "index": 5, - "comment": "goto General information", + "comment": "goto info menu", "additional_information": { "present": [ - "friendly:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (OS and python version information)", - " 0│--- ▒", - " 1│friendly: ▒", - " 2│ details: |- ▒", - " 3│ Fedora release 37 (Thirty Seven) ▒", - " 4│os: ▒", - " 5│ details: ▒", - " 6│ - ansi-color: 0;38;2;60;110;180 ▒", - " 7│ bug-report-url: https://bugzilla.redhat.com/ ▒", - " 8│ cpe-name: cpe:/o:fedoraproject:fedora:37 ▒", - " 9│ default-hostname: fedora ▒", - "10│ documentation-url: https://docs.fedoraproject.org/en-US/fedora/f37/system-administrators-guide/ ▒", - "11│ home-url: https://fedoraproject.org/", - "12│ id: fedora", - "13│ logo: fedora-logo-icon", - "14│ name: Fedora Linux", - "15│ platform-id: platform:f37", - "16│ pretty-name: Fedora Linux 37 (Container Image)", - "17│ redhat-bugzilla-product: Fedora", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/6.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/6.json index 2c6bd2924..a0cea1484 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/6.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/6.json @@ -1,22 +1,34 @@ { - "name": "test[06-:back-goto info menu]", + "name": "test[06-:1-goto General information]", "index": 6, - "comment": "goto info menu", + "comment": "goto General information", "additional_information": { "present": [ - "Everything" + "friendly:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (OS and python version information)", + " 0│--- ▒", + " 1│friendly: ▒", + " 2│ details: |- ▒", + " 3│ Fedora release 37 (Thirty Seven) ▒", + " 4│os: ▒", + " 5│ details: ▒", + " 6│ - ansi-color: 0;38;2;60;110;180 ▒", + " 7│ bug-report-url: https://bugzilla.redhat.com/ ▒", + " 8│ cpe-name: cpe:/o:fedoraproject:fedora:37 ▒", + " 9│ default-hostname: fedora ▒", + "10│ documentation-url: https://docs.fedoraproject.org/en-US/fedora/f37/system-administrators-guide/ ▒", + "11│ home-url: https://fedoraproject.org/", + "12│ id: fedora", + "13│ logo: fedora-logo-icon", + "14│ name: Fedora Linux", + "15│ platform-id: platform:f37", + "16│ pretty-name: Fedora Linux 37 (Container Image)", + "17│ redhat-bugzilla-product: Fedora", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/7.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/7.json index 25bffef5a..e169b2835 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/7.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/7.json @@ -1,29 +1,22 @@ { - "name": "test[07-:2-goto Ansible information]", + "name": "test[07-:back-goto info menu]", "index": 7, - "comment": "goto Ansible information", + "comment": "goto info menu", "additional_information": { "present": [ - "collections:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (Information about ansible and ansible collections)", - " 0│---", - " 1│ansible:", - " 2│ collections:", - " 3│ details:", - " 4│ ansible.posix: 1.5.1", - " 5│ ansible.windows: 1.13.0", - " 6│ awx.awx: 21.11.0", - " 7│ containers.podman: 1.10.1", - " 8│ kubernetes.core: 2.4.0", - " 9│ redhatinsights.insights: 1.0.7", - "10│ theforeman.foreman: 3.8.0", - "11│ version:", - "12│ details: ansible [core 2.14.1]", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/8.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/8.json index 593e85d02..395025e01 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/8.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/8.json @@ -1,22 +1,29 @@ { - "name": "test[08-:back-goto info menu]", + "name": "test[08-:2-goto Ansible information]", "index": 8, - "comment": "goto info menu", + "comment": "goto Ansible information", "additional_information": { "present": [ - "Everything" + "collections:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee: v24.2.0(primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (Information about ansible and ansible collections)", + " 0│---", + " 1│ansible:", + " 2│ collections:", + " 3│ details:", + " 4│ ansible.posix: 1.5.1", + " 5│ ansible.windows: 1.13.0", + " 6│ awx.awx: 21.11.0", + " 7│ containers.podman: 1.10.1", + " 8│ kubernetes.core: 2.4.0", + " 9│ redhatinsights.insights: 1.0.7", + "10│ theforeman.foreman: 3.8.0", + "11│ version:", + "12│ details: ansible [core 2.14.1]", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/9.json b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/9.json index 5162836f0..6d7643c18 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/9.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/9.json @@ -1,34 +1,22 @@ { - "name": "test[09-:3-goto Python information]", + "name": "test[09-:back-goto info menu]", "index": 9, - "comment": "goto Python information", + "comment": "goto info menu", "additional_information": { "present": [ - "ansible-runner" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - " Name Version Summary", - " 0│ansible-compat 3.0.1 Ansible compatibility goodies ▒", - " 1│ansible-core 2.14.1 Radically simple IT automation ▒", - " 2│ansible-lint 6.12.2 Checks playbooks for practices and behavior that could potentially be improved ▒", - " 3│ansible-runner 2.3.1 \"Consistent Ansible Python API and CLI with container and process isolation runtime capabilities ▒", - " 4│arrow 1.2.3 Better dates & times for Python ▒", - " 5│attrs 22.2.0 Classes Without Boilerplate ▒", - " 6│bcrypt 3.2.2 Modern password hashing for your software and your servers", - " 7│binaryornot 0.4.4 Ultra-lightweight pure Python package to check if a file is binary or text.", - " 8│black 22.12.0 The uncompromising code formatter.", - " 9│bracex 2.3.post1 Bash style brace expander.", - "10│certifi 2022.12.7 Python package for providing Mozilla's CA Bundle.", - "11│cffi 1.15.1 Foreign Function Interface for Python calling C code.", - "12│chardet 5.1.0 Universal encoding detector for Python 3", - "13│charset-normalizer 3.0.1 The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.", - "14│click 8.1.3 Composable command line interface toolkit", - "15│click-help-colors 0.9.1 Colorization of help messages in Click", - "16│cookiecutter 2.1.1 A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template.", - "17│cryptography 39.0.1 cryptography is a package which provides cryptographic recipes and primitives to Python developers.", + " Image: creator-ee: v24.2.0(primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/integration/actions/images/base.py b/tests/integration/actions/images/base.py index 75d33493e..38a47e76c 100644 --- a/tests/integration/actions/images/base.py +++ b/tests/integration/actions/images/base.py @@ -32,6 +32,11 @@ comment=f"filter for {IMAGE_VERSION}", present=[IMAGE_VERSION], ), + UiTestStep( + user_input=":f community", + comment="filter for community", + present=["community"], + ), UiTestStep(user_input=":0", comment="goto info menu", present=["Everything"]), UiTestStep(user_input=":0", comment="goto Image information", present=["architecture:"]), step_back, diff --git a/tests/integration/actions/images/test_direct_interactive_ee.py b/tests/integration/actions/images/test_direct_interactive_ee.py index d64ee6155..55b8a8da3 100644 --- a/tests/integration/actions/images/test_direct_interactive_ee.py +++ b/tests/integration/actions/images/test_direct_interactive_ee.py @@ -7,7 +7,6 @@ from tests.integration._interactions import add_indices from tests.integration._interactions import step_id_padded -from .base import IMAGE_VERSION from .base import BaseClass from .base import base_steps @@ -18,7 +17,7 @@ UiTestStep( user_input=CLI, comment="ansible-navigator images top window", - present=[IMAGE_VERSION], + present=["community-ansible-dev-tools"], ), ) From 52719d2c0caf22099796c6424bf09e1a5c232a90 Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Fri, 12 Jul 2024 16:03:37 +0530 Subject: [PATCH 04/12] Fix test_direct_interactive_noee for images --- .../test/1.json | 4 +-- .../test/10.json | 32 +++++++++++------ .../test/11.json | 32 ++++++----------- .../test/12.json | 32 +++++++++++------ .../test/13.json | 34 ++++++------------- .../test/14.json | 34 +++++++++++++++++++ .../test/2.json | 15 +++----- .../test/3.json | 34 ++++++------------- .../test/4.json | 34 +++++++++++++------ .../test/5.json | 34 ++++++------------- .../test/6.json | 34 +++++++++++++------ .../test/7.json | 29 ++++++---------- .../test/8.json | 29 ++++++++++------ .../test/9.json | 32 ++++++----------- .../images/test_direct_interactive_noee.py | 3 +- 15 files changed, 214 insertions(+), 198 deletions(-) create mode 100644 tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/14.json diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/1.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/1.json index 68e13e542..dabad9c31 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/1.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/1.json @@ -1,7 +1,7 @@ { - "name": "test[01-:f community-ansible-dev-tools-filter for community-ansible-dev-tools]", + "name": "test[01-:f latest-filter for latest]", "index": 1, - "comment": "filter for community-ansible-dev-tools", + "comment": "filter for latest", "additional_information": { "present": [ "latest" diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/10.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/10.json index 1ddca4d0a..23a9d93bf 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/10.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/10.json @@ -1,22 +1,34 @@ { - "name": "test[10-:back-goto info menu]", + "name": "test[10-:3-goto Python information]", "index": 10, - "comment": "goto info menu", + "comment": "goto Python information", "additional_information": { "present": [ - "Everything" + "ansible-runner" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Name Version Summary", + " 0│ansible-compat 3.0.1 Ansible compatibility goodies ▒", + " 1│ansible-core 2.14.1 Radically simple IT automation ▒", + " 2│ansible-lint 6.12.2 Checks playbooks for practices and behavior that could potentially be improved ▒", + " 3│ansible-runner 2.3.1 \"Consistent Ansible Python API and CLI with container and process isolation runtime capabilities ▒", + " 4│arrow 1.2.3 Better dates & times for Python ▒", + " 5│attrs 22.2.0 Classes Without Boilerplate ▒", + " 6│bcrypt 3.2.2 Modern password hashing for your software and your servers", + " 7│binaryornot 0.4.4 Ultra-lightweight pure Python package to check if a file is binary or text.", + " 8│black 22.12.0 The uncompromising code formatter.", + " 9│bracex 2.3.post1 Bash style brace expander.", + "10│certifi 2022.12.7 Python package for providing Mozilla's CA Bundle.", + "11│cffi 1.15.1 Foreign Function Interface for Python calling C code.", + "12│chardet 5.1.0 Universal encoding detector for Python 3", + "13│charset-normalizer 3.0.1 The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.", + "14│click 8.1.3 Composable command line interface toolkit", + "15│click-help-colors 0.9.1 Colorization of help messages in Click", + "16│cookiecutter 2.1.1 A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template.", + "17│cryptography 39.0.1 cryptography is a package which provides cryptographic recipes and primitives to Python developers.", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/11.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/11.json index 19d96474e..f2dfb9b6b 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/11.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/11.json @@ -1,34 +1,22 @@ { - "name": "test[11-:4-goto System information]", + "name": "test[11-:back-goto info menu]", "index": 11, - "comment": "goto System information", + "comment": "goto info menu", "additional_information": { "present": [ - "basesystem" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - " Name Version Summary", - " 0│aardvark-dns 1.4.0 Authoritative DNS server for A/AAAA container records ▒", - " 1│alternatives 1.21 A tool to maintain symbolic links determining default commands ▒", - " 2│audit-libs 3.0.9 Dynamic library for libaudit", - " 3│authselect 1.4.2 Configures authentication and identity sources from supported profiles", - " 4│authselect-libs 1.4.2 Utility library used by the authselect tool", - " 5│basesystem 11 The skeleton package which defines a simple Fedora system", - " 6│bash 5.2.15 The GNU Bourne Again shell", - " 7│bzip2-libs 1.0.8 Libraries for applications using bzip2", - " 8│ca-certificates 2023.2.60 The Mozilla CA root certificate bundle", - " 9│catatonit 0.1.7 A signal-forwarding process manager for containers", - " 10│conmon 2.1.5 OCI container runtime monitor", - " 11│containers-common 1 Common configuration and documentation for containers", - " 12│containers-common-extra 1 Extra dependencies for Podman and Buildah", - " 13│coreutils 9.1 A set of basic GNU tools commonly used in shell scripts", - " 14│coreutils-common 9.1 coreutils common optional components", - " 15│cracklib 2.9.7 A password-checking library", - " 16│cracklib-dicts 2.9.7 The standard CrackLib dictionaries", - " 17│criu 3.17.1 Tool for Checkpoint/Restore in User-space", + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/12.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/12.json index 15311e4a0..8b16e8c2d 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/12.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/12.json @@ -1,22 +1,34 @@ { - "name": "test[12-:back-goto info menu]", + "name": "test[12-:4-goto System information]", "index": 12, - "comment": "goto info menu", + "comment": "goto System information", "additional_information": { "present": [ - "Everything" + "basesystem" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Name Version Summary", + " 0│aardvark-dns 1.4.0 Authoritative DNS server for A/AAAA container records ▒", + " 1│alternatives 1.21 A tool to maintain symbolic links determining default commands ▒", + " 2│audit-libs 3.0.9 Dynamic library for libaudit", + " 3│authselect 1.4.2 Configures authentication and identity sources from supported profiles", + " 4│authselect-libs 1.4.2 Utility library used by the authselect tool", + " 5│basesystem 11 The skeleton package which defines a simple Fedora system", + " 6│bash 5.2.15 The GNU Bourne Again shell", + " 7│bzip2-libs 1.0.8 Libraries for applications using bzip2", + " 8│ca-certificates 2023.2.60 The Mozilla CA root certificate bundle", + " 9│catatonit 0.1.7 A signal-forwarding process manager for containers", + " 10│conmon 2.1.5 OCI container runtime monitor", + " 11│containers-common 1 Common configuration and documentation for containers", + " 12│containers-common-extra 1 Extra dependencies for Podman and Buildah", + " 13│coreutils 9.1 A set of basic GNU tools commonly used in shell scripts", + " 14│coreutils-common 9.1 coreutils common optional components", + " 15│cracklib 2.9.7 A password-checking library", + " 16│cracklib-dicts 2.9.7 The standard CrackLib dictionaries", + " 17│criu 3.17.1 Tool for Checkpoint/Restore in User-space", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/13.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/13.json index 40a96127c..411ecb1fc 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/13.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/13.json @@ -1,34 +1,22 @@ { - "name": "test[13-:5-goto Everything]", + "name": "test[13-:back-goto info menu]", "index": 13, - "comment": "goto Everything", + "comment": "goto info menu", "additional_information": { "present": [ - "collections:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (All image information)", - " 0│--- ▒", - " 1│ansible:", - " 2│ ansible:", - " 3│ collections:", - " 4│ details:", - " 5│ ansible.posix: 1.5.1", - " 6│ ansible.windows: 1.13.0", - " 7│ awx.awx: 21.11.0", - " 8│ containers.podman: 1.10.1", - " 9│ kubernetes.core: 2.4.0", - " 10│ redhatinsights.insights: 1.0.7", - " 11│ theforeman.foreman: 3.8.0", - " 12│ version:", - " 13│ details: ansible [core 2.14.1]", - " 14│created: 5 weeks ago", - " 15│execution_environment: true", - " 16│general:", - " 17│ friendly:", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/14.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/14.json new file mode 100644 index 000000000..0795b7130 --- /dev/null +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/14.json @@ -0,0 +1,34 @@ +{ + "name": "test[14-:5-goto Everything]", + "index": 14, + "comment": "goto Everything", + "additional_information": { + "present": [ + "collections:" + ], + "absent": [], + "compared_fixture": false + }, + "output": [ + "Image: creator-ee:v24.2.0 (primary) (All image information)", + " 0│--- ▒", + " 1│ansible:", + " 2│ ansible:", + " 3│ collections:", + " 4│ details:", + " 5│ ansible.posix: 1.5.1", + " 6│ ansible.windows: 1.13.0", + " 7│ awx.awx: 21.11.0", + " 8│ containers.podman: 1.10.1", + " 9│ kubernetes.core: 2.4.0", + " 10│ redhatinsights.insights: 1.0.7", + " 11│ theforeman.foreman: 3.8.0", + " 12│ version:", + " 13│ details: ansible [core 2.14.1]", + " 14│created: 5 weeks ago", + " 15│execution_environment: true", + " 16│general:", + " 17│ friendly:", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + ] +} diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/2.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/2.json index 4e7234e72..89a418c1b 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/2.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/2.json @@ -1,22 +1,17 @@ { - "name": "test[02-:0-goto info menu]", + "name": "test[02-:f community-filter for community]", "index": 2, - "comment": "goto info menu", + "comment": "filter for community", "additional_information": { "present": [ - "Everything" + "community" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Image Tag Execution environment Created Size", + "0│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/3.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/3.json index 264b6565f..5ad4c41e6 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/3.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/3.json @@ -1,34 +1,22 @@ { - "name": "test[03-:0-goto Image information]", + "name": "test[03-:0-goto info menu]", "index": 3, - "comment": "goto Image information", + "comment": "goto info menu", "additional_information": { "present": [ - "architecture:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (Information collected from image inspection)", - " 0│--- ▒", - " 1│details: ▒", - " 2│ annotations: {}", - " 3│ architecture: amd64", - " 4│ author: ''", - " 5│ comment: Created by Image Factory", - " 6│ config:", - " 7│ entrypoint:", - " 8│ - entrypoint", - " 9│ env:", - " 10│ - DISTTAG=f37container", - " 11│ - FGC=f37", - " 12│ - container=oci", - " 13│ - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", - " 14│ - CONTAINER_NAME=creator-ee:v24.2.0", - " 15│ labels:", - " 16│ ansible-execution-environment: 'true'", - " 17│ io.buildah.version: 1.23.1", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/4.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/4.json index 663799702..b130b6cd4 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/4.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/4.json @@ -1,22 +1,34 @@ { - "name": "test[04-:back-goto info menu]", + "name": "test[04-:0-goto Image information]", "index": 4, - "comment": "goto info menu", + "comment": "goto Image information", "additional_information": { "present": [ - "Everything" + "architecture:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (Information collected from image inspection)", + " 0│--- ▒", + " 1│details: ▒", + " 2│ annotations: {}", + " 3│ architecture: amd64", + " 4│ author: ''", + " 5│ comment: Created by Image Factory", + " 6│ config:", + " 7│ entrypoint:", + " 8│ - entrypoint", + " 9│ env:", + " 10│ - DISTTAG=f37container", + " 11│ - FGC=f37", + " 12│ - container=oci", + " 13│ - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + " 14│ - CONTAINER_NAME=creator-ee:v24.2.0", + " 15│ labels:", + " 16│ ansible-execution-environment: 'true'", + " 17│ io.buildah.version: 1.23.1", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/5.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/5.json index 8675e1349..a63ba85bb 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/5.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/5.json @@ -1,34 +1,22 @@ { - "name": "test[05-:1-goto General information]", + "name": "test[05-:back-goto info menu]", "index": 5, - "comment": "goto General information", + "comment": "goto info menu", "additional_information": { "present": [ - "friendly:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (OS and python version information)", - " 0│--- ▒", - " 1│friendly: ▒", - " 2│ details: |- ▒", - " 3│ Fedora release 37 (Thirty Seven) ▒", - " 4│os: ▒", - " 5│ details: ▒", - " 6│ - ansi-color: 0;38;2;60;110;180 ▒", - " 7│ bug-report-url: https://bugzilla.redhat.com/ ▒", - " 8│ cpe-name: cpe:/o:fedoraproject:fedora:37 ▒", - " 9│ default-hostname: fedora ▒", - "10│ documentation-url: https://docs.fedoraproject.org/en-US/fedora/f37/system-administrators-guide/ ▒", - "11│ home-url: https://fedoraproject.org/", - "12│ id: fedora", - "13│ logo: fedora-logo-icon", - "14│ name: Fedora Linux", - "15│ platform-id: platform:f37", - "16│ pretty-name: Fedora Linux 37 (Container Image)", - "17│ redhat-bugzilla-product: Fedora", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/6.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/6.json index 2c6bd2924..a0cea1484 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/6.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/6.json @@ -1,22 +1,34 @@ { - "name": "test[06-:back-goto info menu]", + "name": "test[06-:1-goto General information]", "index": 6, - "comment": "goto info menu", + "comment": "goto General information", "additional_information": { "present": [ - "Everything" + "friendly:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (OS and python version information)", + " 0│--- ▒", + " 1│friendly: ▒", + " 2│ details: |- ▒", + " 3│ Fedora release 37 (Thirty Seven) ▒", + " 4│os: ▒", + " 5│ details: ▒", + " 6│ - ansi-color: 0;38;2;60;110;180 ▒", + " 7│ bug-report-url: https://bugzilla.redhat.com/ ▒", + " 8│ cpe-name: cpe:/o:fedoraproject:fedora:37 ▒", + " 9│ default-hostname: fedora ▒", + "10│ documentation-url: https://docs.fedoraproject.org/en-US/fedora/f37/system-administrators-guide/ ▒", + "11│ home-url: https://fedoraproject.org/", + "12│ id: fedora", + "13│ logo: fedora-logo-icon", + "14│ name: Fedora Linux", + "15│ platform-id: platform:f37", + "16│ pretty-name: Fedora Linux 37 (Container Image)", + "17│ redhat-bugzilla-product: Fedora", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/7.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/7.json index 25bffef5a..e169b2835 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/7.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/7.json @@ -1,29 +1,22 @@ { - "name": "test[07-:2-goto Ansible information]", + "name": "test[07-:back-goto info menu]", "index": 7, - "comment": "goto Ansible information", + "comment": "goto info menu", "additional_information": { "present": [ - "collections:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (Information about ansible and ansible collections)", - " 0│---", - " 1│ansible:", - " 2│ collections:", - " 3│ details:", - " 4│ ansible.posix: 1.5.1", - " 5│ ansible.windows: 1.13.0", - " 6│ awx.awx: 21.11.0", - " 7│ containers.podman: 1.10.1", - " 8│ kubernetes.core: 2.4.0", - " 9│ redhatinsights.insights: 1.0.7", - "10│ theforeman.foreman: 3.8.0", - "11│ version:", - "12│ details: ansible [core 2.14.1]", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/8.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/8.json index 4dd263685..395025e01 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/8.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/8.json @@ -1,22 +1,29 @@ { - "name": "test[08-:back-goto info menu]", + "name": "test[08-:2-goto Ansible information]", "index": 8, - "comment": "goto info menu", + "comment": "goto Ansible information", "additional_information": { "present": [ - "Everything" + "collections:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (Information about ansible and ansible collections)", + " 0│---", + " 1│ansible:", + " 2│ collections:", + " 3│ details:", + " 4│ ansible.posix: 1.5.1", + " 5│ ansible.windows: 1.13.0", + " 6│ awx.awx: 21.11.0", + " 7│ containers.podman: 1.10.1", + " 8│ kubernetes.core: 2.4.0", + " 9│ redhatinsights.insights: 1.0.7", + "10│ theforeman.foreman: 3.8.0", + "11│ version:", + "12│ details: ansible [core 2.14.1]", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/9.json b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/9.json index 5162836f0..9fe235206 100644 --- a/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/9.json +++ b/tests/fixtures/integration/actions/images/test_direct_interactive_noee.py/test/9.json @@ -1,34 +1,22 @@ { - "name": "test[09-:3-goto Python information]", + "name": "test[09-:back-goto info menu]", "index": 9, - "comment": "goto Python information", + "comment": "goto info menu", "additional_information": { "present": [ - "ansible-runner" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - " Name Version Summary", - " 0│ansible-compat 3.0.1 Ansible compatibility goodies ▒", - " 1│ansible-core 2.14.1 Radically simple IT automation ▒", - " 2│ansible-lint 6.12.2 Checks playbooks for practices and behavior that could potentially be improved ▒", - " 3│ansible-runner 2.3.1 \"Consistent Ansible Python API and CLI with container and process isolation runtime capabilities ▒", - " 4│arrow 1.2.3 Better dates & times for Python ▒", - " 5│attrs 22.2.0 Classes Without Boilerplate ▒", - " 6│bcrypt 3.2.2 Modern password hashing for your software and your servers", - " 7│binaryornot 0.4.4 Ultra-lightweight pure Python package to check if a file is binary or text.", - " 8│black 22.12.0 The uncompromising code formatter.", - " 9│bracex 2.3.post1 Bash style brace expander.", - "10│certifi 2022.12.7 Python package for providing Mozilla's CA Bundle.", - "11│cffi 1.15.1 Foreign Function Interface for Python calling C code.", - "12│chardet 5.1.0 Universal encoding detector for Python 3", - "13│charset-normalizer 3.0.1 The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.", - "14│click 8.1.3 Composable command line interface toolkit", - "15│click-help-colors 0.9.1 Colorization of help messages in Click", - "16│cookiecutter 2.1.1 A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template.", - "17│cryptography 39.0.1 cryptography is a package which provides cryptographic recipes and primitives to Python developers.", + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/integration/actions/images/test_direct_interactive_noee.py b/tests/integration/actions/images/test_direct_interactive_noee.py index deebb9d81..289f02e4e 100644 --- a/tests/integration/actions/images/test_direct_interactive_noee.py +++ b/tests/integration/actions/images/test_direct_interactive_noee.py @@ -7,7 +7,6 @@ from tests.integration._interactions import add_indices from tests.integration._interactions import step_id_padded -from .base import IMAGE_VERSION from .base import BaseClass from .base import base_steps @@ -19,7 +18,7 @@ UiTestStep( user_input=CLI, comment="ansible-navigator images top window", - present=[IMAGE_VERSION], + present=["community-ansible-dev-tools"], ), ) From eaa570b8a621e09593a6825911245f95ab145c3e Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Fri, 12 Jul 2024 19:23:35 +0530 Subject: [PATCH 05/12] Fix welcome_interactive tests for images --- .../test/10.json | 32 ++++++----------- .../test/11.json | 32 +++++++++++------ .../test/12.json | 32 ++++++----------- .../test/13.json | 32 +++++++++++------ .../test/14.json | 34 ++++++------------- .../test/15.json | 34 +++++++++++++++++++ .../test/2.json | 4 +-- .../test/3.json | 15 +++----- .../test/4.json | 34 ++++++------------- .../test/5.json | 34 +++++++++++++------ .../test/6.json | 34 ++++++------------- .../test/7.json | 34 +++++++++++++------ .../test/8.json | 29 ++++++---------- .../test/9.json | 29 ++++++++++------ .../test/10.json | 32 ++++++----------- .../test/11.json | 32 +++++++++++------ .../test/12.json | 32 ++++++----------- .../test/13.json | 32 +++++++++++------ .../test/14.json | 34 ++++++------------- .../test/15.json | 34 +++++++++++++++++++ .../test/2.json | 4 +-- .../test/3.json | 15 +++----- .../test/4.json | 34 ++++++------------- .../test/5.json | 34 +++++++++++++------ .../test/6.json | 34 ++++++------------- .../test/7.json | 34 +++++++++++++------ .../test/8.json | 29 ++++++---------- .../test/9.json | 29 ++++++++++------ .../images/test_welcome_interactive_ee.py | 3 +- .../images/test_welcome_interactive_noee.py | 3 +- 30 files changed, 428 insertions(+), 396 deletions(-) create mode 100644 tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/15.json create mode 100644 tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/15.json diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/10.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/10.json index 23a9d93bf..1ddca4d0a 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/10.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/10.json @@ -1,34 +1,22 @@ { - "name": "test[10-:3-goto Python information]", + "name": "test[10-:back-goto info menu]", "index": 10, - "comment": "goto Python information", + "comment": "goto info menu", "additional_information": { "present": [ - "ansible-runner" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - " Name Version Summary", - " 0│ansible-compat 3.0.1 Ansible compatibility goodies ▒", - " 1│ansible-core 2.14.1 Radically simple IT automation ▒", - " 2│ansible-lint 6.12.2 Checks playbooks for practices and behavior that could potentially be improved ▒", - " 3│ansible-runner 2.3.1 \"Consistent Ansible Python API and CLI with container and process isolation runtime capabilities ▒", - " 4│arrow 1.2.3 Better dates & times for Python ▒", - " 5│attrs 22.2.0 Classes Without Boilerplate ▒", - " 6│bcrypt 3.2.2 Modern password hashing for your software and your servers", - " 7│binaryornot 0.4.4 Ultra-lightweight pure Python package to check if a file is binary or text.", - " 8│black 22.12.0 The uncompromising code formatter.", - " 9│bracex 2.3.post1 Bash style brace expander.", - "10│certifi 2022.12.7 Python package for providing Mozilla's CA Bundle.", - "11│cffi 1.15.1 Foreign Function Interface for Python calling C code.", - "12│chardet 5.1.0 Universal encoding detector for Python 3", - "13│charset-normalizer 3.0.1 The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.", - "14│click 8.1.3 Composable command line interface toolkit", - "15│click-help-colors 0.9.1 Colorization of help messages in Click", - "16│cookiecutter 2.1.1 A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template.", - "17│cryptography 39.0.1 cryptography is a package which provides cryptographic recipes and primitives to Python developers.", + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/11.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/11.json index f2dfb9b6b..9d09665cd 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/11.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/11.json @@ -1,22 +1,34 @@ { - "name": "test[11-:back-goto info menu]", + "name": "test[11-:3-goto Python information]", "index": 11, - "comment": "goto info menu", + "comment": "goto Python information", "additional_information": { "present": [ - "Everything" + "ansible-runner" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Name Version Summary", + " 0│ansible-compat 3.0.1 Ansible compatibility goodies ▒", + " 1│ansible-core 2.14.1 Radically simple IT automation ▒", + " 2│ansible-lint 6.12.2 Checks playbooks for practices and behavior that could potentially be improved ▒", + " 3│ansible-runner 2.3.1 \"Consistent Ansible Python API and CLI with container and process isolation runtime capabilities ▒", + " 4│arrow 1.2.3 Better dates & times for Python ▒", + " 5│attrs 22.2.0 Classes Without Boilerplate ▒", + " 6│bcrypt 3.2.2 Modern password hashing for your software and your servers", + " 7│binaryornot 0.4.4 Ultra-lightweight pure Python package to check if a file is binary or text.", + " 8│black 22.12.0 The uncompromising code formatter.", + " 9│bracex 2.3.post1 Bash style brace expander.", + "10│certifi 2022.12.7 Python package for providing Mozilla's CA Bundle.", + "11│cffi 1.15.1 Foreign Function Interface for Python calling C code.", + "12│chardet 5.1.0 Universal encoding detector for Python 3", + "13│charset-normalizer 3.0.1 The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.", + "14│click 8.1.3 Composable command line interface toolkit", + "15│click-help-colors 0.9.1 Colorization of help messages in Click", + "16│cookiecutter 2.1.1 A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template.", + "17│cryptography 39.0.1 cryptography is a package which provides cryptographic recipes and primitives to Python developers.", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/12.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/12.json index 8b16e8c2d..15311e4a0 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/12.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/12.json @@ -1,34 +1,22 @@ { - "name": "test[12-:4-goto System information]", + "name": "test[12-:back-goto info menu]", "index": 12, - "comment": "goto System information", + "comment": "goto info menu", "additional_information": { "present": [ - "basesystem" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - " Name Version Summary", - " 0│aardvark-dns 1.4.0 Authoritative DNS server for A/AAAA container records ▒", - " 1│alternatives 1.21 A tool to maintain symbolic links determining default commands ▒", - " 2│audit-libs 3.0.9 Dynamic library for libaudit", - " 3│authselect 1.4.2 Configures authentication and identity sources from supported profiles", - " 4│authselect-libs 1.4.2 Utility library used by the authselect tool", - " 5│basesystem 11 The skeleton package which defines a simple Fedora system", - " 6│bash 5.2.15 The GNU Bourne Again shell", - " 7│bzip2-libs 1.0.8 Libraries for applications using bzip2", - " 8│ca-certificates 2023.2.60 The Mozilla CA root certificate bundle", - " 9│catatonit 0.1.7 A signal-forwarding process manager for containers", - " 10│conmon 2.1.5 OCI container runtime monitor", - " 11│containers-common 1 Common configuration and documentation for containers", - " 12│containers-common-extra 1 Extra dependencies for Podman and Buildah", - " 13│coreutils 9.1 A set of basic GNU tools commonly used in shell scripts", - " 14│coreutils-common 9.1 coreutils common optional components", - " 15│cracklib 2.9.7 A password-checking library", - " 16│cracklib-dicts 2.9.7 The standard CrackLib dictionaries", - " 17│criu 3.17.1 Tool for Checkpoint/Restore in User-space", + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/13.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/13.json index 411ecb1fc..b838ba90b 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/13.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/13.json @@ -1,22 +1,34 @@ { - "name": "test[13-:back-goto info menu]", + "name": "test[13-:4-goto System information]", "index": 13, - "comment": "goto info menu", + "comment": "goto System information", "additional_information": { "present": [ - "Everything" + "basesystem" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Name Version Summary", + " 0│aardvark-dns 1.4.0 Authoritative DNS server for A/AAAA container records ▒", + " 1│alternatives 1.21 A tool to maintain symbolic links determining default commands ▒", + " 2│audit-libs 3.0.9 Dynamic library for libaudit", + " 3│authselect 1.4.2 Configures authentication and identity sources from supported profiles", + " 4│authselect-libs 1.4.2 Utility library used by the authselect tool", + " 5│basesystem 11 The skeleton package which defines a simple Fedora system", + " 6│bash 5.2.15 The GNU Bourne Again shell", + " 7│bzip2-libs 1.0.8 Libraries for applications using bzip2", + " 8│ca-certificates 2023.2.60 The Mozilla CA root certificate bundle", + " 9│catatonit 0.1.7 A signal-forwarding process manager for containers", + " 10│conmon 2.1.5 OCI container runtime monitor", + " 11│containers-common 1 Common configuration and documentation for containers", + " 12│containers-common-extra 1 Extra dependencies for Podman and Buildah", + " 13│coreutils 9.1 A set of basic GNU tools commonly used in shell scripts", + " 14│coreutils-common 9.1 coreutils common optional components", + " 15│cracklib 2.9.7 A password-checking library", + " 16│cracklib-dicts 2.9.7 The standard CrackLib dictionaries", + " 17│criu 3.17.1 Tool for Checkpoint/Restore in User-space", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/14.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/14.json index 0795b7130..3cebade14 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/14.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/14.json @@ -1,34 +1,22 @@ { - "name": "test[14-:5-goto Everything]", + "name": "test[14-:back-goto info menu]", "index": 14, - "comment": "goto Everything", + "comment": "goto info menu", "additional_information": { "present": [ - "collections:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (All image information)", - " 0│--- ▒", - " 1│ansible:", - " 2│ ansible:", - " 3│ collections:", - " 4│ details:", - " 5│ ansible.posix: 1.5.1", - " 6│ ansible.windows: 1.13.0", - " 7│ awx.awx: 21.11.0", - " 8│ containers.podman: 1.10.1", - " 9│ kubernetes.core: 2.4.0", - " 10│ redhatinsights.insights: 1.0.7", - " 11│ theforeman.foreman: 3.8.0", - " 12│ version:", - " 13│ details: ansible [core 2.14.1]", - " 14│created: 5 weeks ago", - " 15│execution_environment: true", - " 16│general:", - " 17│ friendly:", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/15.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/15.json new file mode 100644 index 000000000..42b62042a --- /dev/null +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/15.json @@ -0,0 +1,34 @@ +{ + "name": "test[15-:5-goto Everything]", + "index": 15, + "comment": "goto Everything", + "additional_information": { + "present": [ + "collections:" + ], + "absent": [], + "compared_fixture": false + }, + "output": [ + "Image: creator-ee:v24.2.0 (primary) (All image information)", + " 0│--- ▒", + " 1│ansible:", + " 2│ ansible:", + " 3│ collections:", + " 4│ details:", + " 5│ ansible.posix: 1.5.1", + " 6│ ansible.windows: 1.13.0", + " 7│ awx.awx: 21.11.0", + " 8│ containers.podman: 1.10.1", + " 9│ kubernetes.core: 2.4.0", + " 10│ redhatinsights.insights: 1.0.7", + " 11│ theforeman.foreman: 3.8.0", + " 12│ version:", + " 13│ details: ansible [core 2.14.1]", + " 14│created: 5 weeks ago", + " 15│execution_environment: true", + " 16│general:", + " 17│ friendly:", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + ] +} diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json index 957798ac6..45924a249 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json @@ -1,7 +1,7 @@ { - "name": "test[02-:f community-ansible-dev-tools-filter for community-ansible-dev-tools]", + "name": "test[02-:f latest-filter for latest]", "index": 2, - "comment": "filter for community-ansible-dev-tools", + "comment": "filter for latest", "additional_information": { "present": [ "latest" diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/3.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/3.json index 5ad4c41e6..6f89ed9b1 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/3.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/3.json @@ -1,22 +1,17 @@ { - "name": "test[03-:0-goto info menu]", + "name": "test[03-:f community-filter for community]", "index": 3, - "comment": "goto info menu", + "comment": "filter for community", "additional_information": { "present": [ - "Everything" + "community" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Image Tag Execution environment Created Size", + "0│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/4.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/4.json index b130b6cd4..ed2d09e22 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/4.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/4.json @@ -1,34 +1,22 @@ { - "name": "test[04-:0-goto Image information]", + "name": "test[04-:0-goto info menu]", "index": 4, - "comment": "goto Image information", + "comment": "goto info menu", "additional_information": { "present": [ - "architecture:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (Information collected from image inspection)", - " 0│--- ▒", - " 1│details: ▒", - " 2│ annotations: {}", - " 3│ architecture: amd64", - " 4│ author: ''", - " 5│ comment: Created by Image Factory", - " 6│ config:", - " 7│ entrypoint:", - " 8│ - entrypoint", - " 9│ env:", - " 10│ - DISTTAG=f37container", - " 11│ - FGC=f37", - " 12│ - container=oci", - " 13│ - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", - " 14│ - CONTAINER_NAME=creator-ee:v24.2.0", - " 15│ labels:", - " 16│ ansible-execution-environment: 'true'", - " 17│ io.buildah.version: 1.23.1", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/5.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/5.json index a63ba85bb..e6feb2f8d 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/5.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/5.json @@ -1,22 +1,34 @@ { - "name": "test[05-:back-goto info menu]", + "name": "test[05-:0-goto Image information]", "index": 5, - "comment": "goto info menu", + "comment": "goto Image information", "additional_information": { "present": [ - "Everything" + "architecture:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (Information collected from image inspection)", + " 0│--- ▒", + " 1│details: ▒", + " 2│ annotations: {}", + " 3│ architecture: amd64", + " 4│ author: ''", + " 5│ comment: Created by Image Factory", + " 6│ config:", + " 7│ entrypoint:", + " 8│ - entrypoint", + " 9│ env:", + " 10│ - DISTTAG=f37container", + " 11│ - FGC=f37", + " 12│ - container=oci", + " 13│ - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + " 14│ - CONTAINER_NAME=creator-ee:v24.2.0", + " 15│ labels:", + " 16│ ansible-execution-environment: 'true'", + " 17│ io.buildah.version: 1.23.1", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/6.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/6.json index a0cea1484..2c6bd2924 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/6.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/6.json @@ -1,34 +1,22 @@ { - "name": "test[06-:1-goto General information]", + "name": "test[06-:back-goto info menu]", "index": 6, - "comment": "goto General information", + "comment": "goto info menu", "additional_information": { "present": [ - "friendly:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (OS and python version information)", - " 0│--- ▒", - " 1│friendly: ▒", - " 2│ details: |- ▒", - " 3│ Fedora release 37 (Thirty Seven) ▒", - " 4│os: ▒", - " 5│ details: ▒", - " 6│ - ansi-color: 0;38;2;60;110;180 ▒", - " 7│ bug-report-url: https://bugzilla.redhat.com/ ▒", - " 8│ cpe-name: cpe:/o:fedoraproject:fedora:37 ▒", - " 9│ default-hostname: fedora ▒", - "10│ documentation-url: https://docs.fedoraproject.org/en-US/fedora/f37/system-administrators-guide/ ▒", - "11│ home-url: https://fedoraproject.org/", - "12│ id: fedora", - "13│ logo: fedora-logo-icon", - "14│ name: Fedora Linux", - "15│ platform-id: platform:f37", - "16│ pretty-name: Fedora Linux 37 (Container Image)", - "17│ redhat-bugzilla-product: Fedora", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/7.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/7.json index e169b2835..0e814da9f 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/7.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/7.json @@ -1,22 +1,34 @@ { - "name": "test[07-:back-goto info menu]", + "name": "test[07-:1-goto General information]", "index": 7, - "comment": "goto info menu", + "comment": "goto General information", "additional_information": { "present": [ - "Everything" + "friendly:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (OS and python version information)", + " 0│--- ▒", + " 1│friendly: ▒", + " 2│ details: |- ▒", + " 3│ Fedora release 37 (Thirty Seven) ▒", + " 4│os: ▒", + " 5│ details: ▒", + " 6│ - ansi-color: 0;38;2;60;110;180 ▒", + " 7│ bug-report-url: https://bugzilla.redhat.com/ ▒", + " 8│ cpe-name: cpe:/o:fedoraproject:fedora:37 ▒", + " 9│ default-hostname: fedora ▒", + "10│ documentation-url: https://docs.fedoraproject.org/en-US/fedora/f37/system-administrators-guide/ ▒", + "11│ home-url: https://fedoraproject.org/", + "12│ id: fedora", + "13│ logo: fedora-logo-icon", + "14│ name: Fedora Linux", + "15│ platform-id: platform:f37", + "16│ pretty-name: Fedora Linux 37 (Container Image)", + "17│ redhat-bugzilla-product: Fedora", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/8.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/8.json index 395025e01..4dd263685 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/8.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/8.json @@ -1,29 +1,22 @@ { - "name": "test[08-:2-goto Ansible information]", + "name": "test[08-:back-goto info menu]", "index": 8, - "comment": "goto Ansible information", + "comment": "goto info menu", "additional_information": { "present": [ - "collections:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (Information about ansible and ansible collections)", - " 0│---", - " 1│ansible:", - " 2│ collections:", - " 3│ details:", - " 4│ ansible.posix: 1.5.1", - " 5│ ansible.windows: 1.13.0", - " 6│ awx.awx: 21.11.0", - " 7│ containers.podman: 1.10.1", - " 8│ kubernetes.core: 2.4.0", - " 9│ redhatinsights.insights: 1.0.7", - "10│ theforeman.foreman: 3.8.0", - "11│ version:", - "12│ details: ansible [core 2.14.1]", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/9.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/9.json index 9fe235206..e55f011ad 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/9.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/9.json @@ -1,22 +1,29 @@ { - "name": "test[09-:back-goto info menu]", + "name": "test[09-:2-goto Ansible information]", "index": 9, - "comment": "goto info menu", + "comment": "goto Ansible information", "additional_information": { "present": [ - "Everything" + "collections:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (Information about ansible and ansible collections)", + " 0│---", + " 1│ansible:", + " 2│ collections:", + " 3│ details:", + " 4│ ansible.posix: 1.5.1", + " 5│ ansible.windows: 1.13.0", + " 6│ awx.awx: 21.11.0", + " 7│ containers.podman: 1.10.1", + " 8│ kubernetes.core: 2.4.0", + " 9│ redhatinsights.insights: 1.0.7", + "10│ theforeman.foreman: 3.8.0", + "11│ version:", + "12│ details: ansible [core 2.14.1]", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/10.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/10.json index 23a9d93bf..1ddca4d0a 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/10.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/10.json @@ -1,34 +1,22 @@ { - "name": "test[10-:3-goto Python information]", + "name": "test[10-:back-goto info menu]", "index": 10, - "comment": "goto Python information", + "comment": "goto info menu", "additional_information": { "present": [ - "ansible-runner" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - " Name Version Summary", - " 0│ansible-compat 3.0.1 Ansible compatibility goodies ▒", - " 1│ansible-core 2.14.1 Radically simple IT automation ▒", - " 2│ansible-lint 6.12.2 Checks playbooks for practices and behavior that could potentially be improved ▒", - " 3│ansible-runner 2.3.1 \"Consistent Ansible Python API and CLI with container and process isolation runtime capabilities ▒", - " 4│arrow 1.2.3 Better dates & times for Python ▒", - " 5│attrs 22.2.0 Classes Without Boilerplate ▒", - " 6│bcrypt 3.2.2 Modern password hashing for your software and your servers", - " 7│binaryornot 0.4.4 Ultra-lightweight pure Python package to check if a file is binary or text.", - " 8│black 22.12.0 The uncompromising code formatter.", - " 9│bracex 2.3.post1 Bash style brace expander.", - "10│certifi 2022.12.7 Python package for providing Mozilla's CA Bundle.", - "11│cffi 1.15.1 Foreign Function Interface for Python calling C code.", - "12│chardet 5.1.0 Universal encoding detector for Python 3", - "13│charset-normalizer 3.0.1 The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.", - "14│click 8.1.3 Composable command line interface toolkit", - "15│click-help-colors 0.9.1 Colorization of help messages in Click", - "16│cookiecutter 2.1.1 A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template.", - "17│cryptography 39.0.1 cryptography is a package which provides cryptographic recipes and primitives to Python developers.", + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/11.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/11.json index f2dfb9b6b..9d09665cd 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/11.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/11.json @@ -1,22 +1,34 @@ { - "name": "test[11-:back-goto info menu]", + "name": "test[11-:3-goto Python information]", "index": 11, - "comment": "goto info menu", + "comment": "goto Python information", "additional_information": { "present": [ - "Everything" + "ansible-runner" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Name Version Summary", + " 0│ansible-compat 3.0.1 Ansible compatibility goodies ▒", + " 1│ansible-core 2.14.1 Radically simple IT automation ▒", + " 2│ansible-lint 6.12.2 Checks playbooks for practices and behavior that could potentially be improved ▒", + " 3│ansible-runner 2.3.1 \"Consistent Ansible Python API and CLI with container and process isolation runtime capabilities ▒", + " 4│arrow 1.2.3 Better dates & times for Python ▒", + " 5│attrs 22.2.0 Classes Without Boilerplate ▒", + " 6│bcrypt 3.2.2 Modern password hashing for your software and your servers", + " 7│binaryornot 0.4.4 Ultra-lightweight pure Python package to check if a file is binary or text.", + " 8│black 22.12.0 The uncompromising code formatter.", + " 9│bracex 2.3.post1 Bash style brace expander.", + "10│certifi 2022.12.7 Python package for providing Mozilla's CA Bundle.", + "11│cffi 1.15.1 Foreign Function Interface for Python calling C code.", + "12│chardet 5.1.0 Universal encoding detector for Python 3", + "13│charset-normalizer 3.0.1 The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.", + "14│click 8.1.3 Composable command line interface toolkit", + "15│click-help-colors 0.9.1 Colorization of help messages in Click", + "16│cookiecutter 2.1.1 A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template.", + "17│cryptography 39.0.1 cryptography is a package which provides cryptographic recipes and primitives to Python developers.", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/12.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/12.json index 8b16e8c2d..15311e4a0 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/12.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/12.json @@ -1,34 +1,22 @@ { - "name": "test[12-:4-goto System information]", + "name": "test[12-:back-goto info menu]", "index": 12, - "comment": "goto System information", + "comment": "goto info menu", "additional_information": { "present": [ - "basesystem" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - " Name Version Summary", - " 0│aardvark-dns 1.4.0 Authoritative DNS server for A/AAAA container records ▒", - " 1│alternatives 1.21 A tool to maintain symbolic links determining default commands ▒", - " 2│audit-libs 3.0.9 Dynamic library for libaudit", - " 3│authselect 1.4.2 Configures authentication and identity sources from supported profiles", - " 4│authselect-libs 1.4.2 Utility library used by the authselect tool", - " 5│basesystem 11 The skeleton package which defines a simple Fedora system", - " 6│bash 5.2.15 The GNU Bourne Again shell", - " 7│bzip2-libs 1.0.8 Libraries for applications using bzip2", - " 8│ca-certificates 2023.2.60 The Mozilla CA root certificate bundle", - " 9│catatonit 0.1.7 A signal-forwarding process manager for containers", - " 10│conmon 2.1.5 OCI container runtime monitor", - " 11│containers-common 1 Common configuration and documentation for containers", - " 12│containers-common-extra 1 Extra dependencies for Podman and Buildah", - " 13│coreutils 9.1 A set of basic GNU tools commonly used in shell scripts", - " 14│coreutils-common 9.1 coreutils common optional components", - " 15│cracklib 2.9.7 A password-checking library", - " 16│cracklib-dicts 2.9.7 The standard CrackLib dictionaries", - " 17│criu 3.17.1 Tool for Checkpoint/Restore in User-space", + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/13.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/13.json index 411ecb1fc..b838ba90b 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/13.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/13.json @@ -1,22 +1,34 @@ { - "name": "test[13-:back-goto info menu]", + "name": "test[13-:4-goto System information]", "index": 13, - "comment": "goto info menu", + "comment": "goto System information", "additional_information": { "present": [ - "Everything" + "basesystem" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Name Version Summary", + " 0│aardvark-dns 1.4.0 Authoritative DNS server for A/AAAA container records ▒", + " 1│alternatives 1.21 A tool to maintain symbolic links determining default commands ▒", + " 2│audit-libs 3.0.9 Dynamic library for libaudit", + " 3│authselect 1.4.2 Configures authentication and identity sources from supported profiles", + " 4│authselect-libs 1.4.2 Utility library used by the authselect tool", + " 5│basesystem 11 The skeleton package which defines a simple Fedora system", + " 6│bash 5.2.15 The GNU Bourne Again shell", + " 7│bzip2-libs 1.0.8 Libraries for applications using bzip2", + " 8│ca-certificates 2023.2.60 The Mozilla CA root certificate bundle", + " 9│catatonit 0.1.7 A signal-forwarding process manager for containers", + " 10│conmon 2.1.5 OCI container runtime monitor", + " 11│containers-common 1 Common configuration and documentation for containers", + " 12│containers-common-extra 1 Extra dependencies for Podman and Buildah", + " 13│coreutils 9.1 A set of basic GNU tools commonly used in shell scripts", + " 14│coreutils-common 9.1 coreutils common optional components", + " 15│cracklib 2.9.7 A password-checking library", + " 16│cracklib-dicts 2.9.7 The standard CrackLib dictionaries", + " 17│criu 3.17.1 Tool for Checkpoint/Restore in User-space", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/14.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/14.json index 0795b7130..3cebade14 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/14.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/14.json @@ -1,34 +1,22 @@ { - "name": "test[14-:5-goto Everything]", + "name": "test[14-:back-goto info menu]", "index": 14, - "comment": "goto Everything", + "comment": "goto info menu", "additional_information": { "present": [ - "collections:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (All image information)", - " 0│--- ▒", - " 1│ansible:", - " 2│ ansible:", - " 3│ collections:", - " 4│ details:", - " 5│ ansible.posix: 1.5.1", - " 6│ ansible.windows: 1.13.0", - " 7│ awx.awx: 21.11.0", - " 8│ containers.podman: 1.10.1", - " 9│ kubernetes.core: 2.4.0", - " 10│ redhatinsights.insights: 1.0.7", - " 11│ theforeman.foreman: 3.8.0", - " 12│ version:", - " 13│ details: ansible [core 2.14.1]", - " 14│created: 5 weeks ago", - " 15│execution_environment: true", - " 16│general:", - " 17│ friendly:", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/15.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/15.json new file mode 100644 index 000000000..42b62042a --- /dev/null +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/15.json @@ -0,0 +1,34 @@ +{ + "name": "test[15-:5-goto Everything]", + "index": 15, + "comment": "goto Everything", + "additional_information": { + "present": [ + "collections:" + ], + "absent": [], + "compared_fixture": false + }, + "output": [ + "Image: creator-ee:v24.2.0 (primary) (All image information)", + " 0│--- ▒", + " 1│ansible:", + " 2│ ansible:", + " 3│ collections:", + " 4│ details:", + " 5│ ansible.posix: 1.5.1", + " 6│ ansible.windows: 1.13.0", + " 7│ awx.awx: 21.11.0", + " 8│ containers.podman: 1.10.1", + " 9│ kubernetes.core: 2.4.0", + " 10│ redhatinsights.insights: 1.0.7", + " 11│ theforeman.foreman: 3.8.0", + " 12│ version:", + " 13│ details: ansible [core 2.14.1]", + " 14│created: 5 weeks ago", + " 15│execution_environment: true", + " 16│general:", + " 17│ friendly:", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + ] +} diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json index 957798ac6..45924a249 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json @@ -1,7 +1,7 @@ { - "name": "test[02-:f community-ansible-dev-tools-filter for community-ansible-dev-tools]", + "name": "test[02-:f latest-filter for latest]", "index": 2, - "comment": "filter for community-ansible-dev-tools", + "comment": "filter for latest", "additional_information": { "present": [ "latest" diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/3.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/3.json index 5ad4c41e6..6f89ed9b1 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/3.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/3.json @@ -1,22 +1,17 @@ { - "name": "test[03-:0-goto info menu]", + "name": "test[03-:f community-filter for community]", "index": 3, - "comment": "goto info menu", + "comment": "filter for community", "additional_information": { "present": [ - "Everything" + "community" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", + " Image Tag Execution environment Created Size", + "0│community-ansible-dev-tools latest True 5 weeks ago 686 MB", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/4.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/4.json index b130b6cd4..ed2d09e22 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/4.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/4.json @@ -1,34 +1,22 @@ { - "name": "test[04-:0-goto Image information]", + "name": "test[04-:0-goto info menu]", "index": 4, - "comment": "goto Image information", + "comment": "goto info menu", "additional_information": { "present": [ - "architecture:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (Information collected from image inspection)", - " 0│--- ▒", - " 1│details: ▒", - " 2│ annotations: {}", - " 3│ architecture: amd64", - " 4│ author: ''", - " 5│ comment: Created by Image Factory", - " 6│ config:", - " 7│ entrypoint:", - " 8│ - entrypoint", - " 9│ env:", - " 10│ - DISTTAG=f37container", - " 11│ - FGC=f37", - " 12│ - container=oci", - " 13│ - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", - " 14│ - CONTAINER_NAME=creator-ee:v24.2.0", - " 15│ labels:", - " 16│ ansible-execution-environment: 'true'", - " 17│ io.buildah.version: 1.23.1", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/5.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/5.json index a63ba85bb..e6feb2f8d 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/5.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/5.json @@ -1,22 +1,34 @@ { - "name": "test[05-:back-goto info menu]", + "name": "test[05-:0-goto Image information]", "index": 5, - "comment": "goto info menu", + "comment": "goto Image information", "additional_information": { "present": [ - "Everything" + "architecture:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (Information collected from image inspection)", + " 0│--- ▒", + " 1│details: ▒", + " 2│ annotations: {}", + " 3│ architecture: amd64", + " 4│ author: ''", + " 5│ comment: Created by Image Factory", + " 6│ config:", + " 7│ entrypoint:", + " 8│ - entrypoint", + " 9│ env:", + " 10│ - DISTTAG=f37container", + " 11│ - FGC=f37", + " 12│ - container=oci", + " 13│ - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + " 14│ - CONTAINER_NAME=creator-ee:v24.2.0", + " 15│ labels:", + " 16│ ansible-execution-environment: 'true'", + " 17│ io.buildah.version: 1.23.1", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/6.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/6.json index a0cea1484..2c6bd2924 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/6.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/6.json @@ -1,34 +1,22 @@ { - "name": "test[06-:1-goto General information]", + "name": "test[06-:back-goto info menu]", "index": 6, - "comment": "goto General information", + "comment": "goto info menu", "additional_information": { "present": [ - "friendly:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (OS and python version information)", - " 0│--- ▒", - " 1│friendly: ▒", - " 2│ details: |- ▒", - " 3│ Fedora release 37 (Thirty Seven) ▒", - " 4│os: ▒", - " 5│ details: ▒", - " 6│ - ansi-color: 0;38;2;60;110;180 ▒", - " 7│ bug-report-url: https://bugzilla.redhat.com/ ▒", - " 8│ cpe-name: cpe:/o:fedoraproject:fedora:37 ▒", - " 9│ default-hostname: fedora ▒", - "10│ documentation-url: https://docs.fedoraproject.org/en-US/fedora/f37/system-administrators-guide/ ▒", - "11│ home-url: https://fedoraproject.org/", - "12│ id: fedora", - "13│ logo: fedora-logo-icon", - "14│ name: Fedora Linux", - "15│ platform-id: platform:f37", - "16│ pretty-name: Fedora Linux 37 (Container Image)", - "17│ redhat-bugzilla-product: Fedora", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/7.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/7.json index e169b2835..0e814da9f 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/7.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/7.json @@ -1,22 +1,34 @@ { - "name": "test[07-:back-goto info menu]", + "name": "test[07-:1-goto General information]", "index": 7, - "comment": "goto info menu", + "comment": "goto General information", "additional_information": { "present": [ - "Everything" + "friendly:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (OS and python version information)", + " 0│--- ▒", + " 1│friendly: ▒", + " 2│ details: |- ▒", + " 3│ Fedora release 37 (Thirty Seven) ▒", + " 4│os: ▒", + " 5│ details: ▒", + " 6│ - ansi-color: 0;38;2;60;110;180 ▒", + " 7│ bug-report-url: https://bugzilla.redhat.com/ ▒", + " 8│ cpe-name: cpe:/o:fedoraproject:fedora:37 ▒", + " 9│ default-hostname: fedora ▒", + "10│ documentation-url: https://docs.fedoraproject.org/en-US/fedora/f37/system-administrators-guide/ ▒", + "11│ home-url: https://fedoraproject.org/", + "12│ id: fedora", + "13│ logo: fedora-logo-icon", + "14│ name: Fedora Linux", + "15│ platform-id: platform:f37", + "16│ pretty-name: Fedora Linux 37 (Container Image)", + "17│ redhat-bugzilla-product: Fedora", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/8.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/8.json index 395025e01..4dd263685 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/8.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/8.json @@ -1,29 +1,22 @@ { - "name": "test[08-:2-goto Ansible information]", + "name": "test[08-:back-goto info menu]", "index": 8, - "comment": "goto Ansible information", + "comment": "goto info menu", "additional_information": { "present": [ - "collections:" + "Everything" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: creator-ee:v24.2.0 (primary) (Information about ansible and ansible collections)", - " 0│---", - " 1│ansible:", - " 2│ collections:", - " 3│ details:", - " 4│ ansible.posix: 1.5.1", - " 5│ ansible.windows: 1.13.0", - " 6│ awx.awx: 21.11.0", - " 7│ containers.podman: 1.10.1", - " 8│ kubernetes.core: 2.4.0", - " 9│ redhatinsights.insights: 1.0.7", - "10│ theforeman.foreman: 3.8.0", - "11│ version:", - "12│ details: ansible [core 2.14.1]", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" + " Image: creator-ee:v24.2.0 (primary) Description", + "0│Image information Information collected from image inspection", + "1│General information OS and python version information", + "2│Ansible version and collections Information about ansible and ansible collections", + "3│Python packages Information about python and python packages", + "4│Operating system packages Information about operating system packages", + "5│Everything All image information", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/9.json b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/9.json index 9fe235206..e55f011ad 100644 --- a/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/9.json +++ b/tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/9.json @@ -1,22 +1,29 @@ { - "name": "test[09-:back-goto info menu]", + "name": "test[09-:2-goto Ansible information]", "index": 9, - "comment": "goto info menu", + "comment": "goto Ansible information", "additional_information": { "present": [ - "Everything" + "collections:" ], "absent": [], "compared_fixture": false }, "output": [ - " Image: creator-ee:v24.2.0 (primary) Description", - "0│Image information Information collected from image inspection", - "1│General information OS and python version information", - "2│Ansible version and collections Information about ansible and ansible collections", - "3│Python packages Information about python and python packages", - "4│Operating system packages Information about operating system packages", - "5│Everything All image information", - "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" + "Image: creator-ee:v24.2.0 (primary) (Information about ansible and ansible collections)", + " 0│---", + " 1│ansible:", + " 2│ collections:", + " 3│ details:", + " 4│ ansible.posix: 1.5.1", + " 5│ ansible.windows: 1.13.0", + " 6│ awx.awx: 21.11.0", + " 7│ containers.podman: 1.10.1", + " 8│ kubernetes.core: 2.4.0", + " 9│ redhatinsights.insights: 1.0.7", + "10│ theforeman.foreman: 3.8.0", + "11│ version:", + "12│ details: ansible [core 2.14.1]", + "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/integration/actions/images/test_welcome_interactive_ee.py b/tests/integration/actions/images/test_welcome_interactive_ee.py index c1be572a8..e4a67c8f1 100644 --- a/tests/integration/actions/images/test_welcome_interactive_ee.py +++ b/tests/integration/actions/images/test_welcome_interactive_ee.py @@ -7,7 +7,6 @@ from tests.integration._interactions import add_indices from tests.integration._interactions import step_id_padded -from .base import IMAGE_VERSION from .base import BaseClass from .base import base_steps @@ -19,7 +18,7 @@ UiTestStep( user_input=":images", comment="ansible-navigator images top window", - present=[IMAGE_VERSION], + present=["community-ansible-dev-tools"], ), ) diff --git a/tests/integration/actions/images/test_welcome_interactive_noee.py b/tests/integration/actions/images/test_welcome_interactive_noee.py index 603338d33..a71730b91 100644 --- a/tests/integration/actions/images/test_welcome_interactive_noee.py +++ b/tests/integration/actions/images/test_welcome_interactive_noee.py @@ -7,7 +7,6 @@ from tests.integration._interactions import add_indices from tests.integration._interactions import step_id_padded -from .base import IMAGE_VERSION from .base import BaseClass from .base import base_steps @@ -20,7 +19,7 @@ UiTestStep( user_input=":images", comment="ansible-navigator images top window", - present=[IMAGE_VERSION], + present=["community-ansible-dev-tools"], ), ) From 04cf15491cb13bf463280af988472320b6fe3e4a Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Mon, 15 Jul 2024 13:31:23 +0530 Subject: [PATCH 06/12] fixture changes for tests failing on CI --- .../test/1.json | 2 +- .../test/filter_doc_with_ee/0.json | 1 + .../test/lookup_doc_with_ee/0.json | 1 + .../test/module_doc_with_ee/0.json | 1 + .../test/filter_doc_pass/1.json | 13 +++---- .../test/lookup_doc_pass/1.json | 27 +++++++------- .../test/module_doc_pass/1.json | 35 ++++++++++--------- .../test_direct_interactive_ee.py/test/5.json | 12 +++---- .../test_direct_interactive_ee.py/test/6.json | 4 +-- .../test_direct_interactive_ee.py/test/7.json | 12 +++---- 10 files changed, 57 insertions(+), 51 deletions(-) diff --git a/tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/1.json b/tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/1.json index c4180fb50..ca95cf482 100644 --- a/tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/1.json +++ b/tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/1.json @@ -16,7 +16,7 @@ " 4│Ansible cow path True default None", " 5│Ansible cow selection True default default", " 6│Ansible force color True default False", - " 7│Ansible home True default /home/runner/.ansible", + " 7│Ansible home True default /root/.ansible", " 8│Ansible nocolor True default False", " 9│Ansible nocows True default False", " 10│Ansible pipelining True default False", diff --git a/tests/fixtures/integration/actions/doc/test_stdout.py/test/filter_doc_with_ee/0.json b/tests/fixtures/integration/actions/doc/test_stdout.py/test/filter_doc_with_ee/0.json index bc31563a6..f2e3292dc 100644 --- a/tests/fixtures/integration/actions/doc/test_stdout.py/test/filter_doc_with_ee/0.json +++ b/tests/fixtures/integration/actions/doc/test_stdout.py/test/filter_doc_with_ee/0.json @@ -16,6 +16,7 @@ " \"notes\": [", " \"This is a dummy filter plugin\"", " ],", + " \"plugin_name\": \"company_name.coll_1.filter_1\",", " \"short_description\": \"This is test filter plugin\",", " \"version_added\": \"1.0.0\",", " \"version_added_collection\": \"company_name.coll_1\"", diff --git a/tests/fixtures/integration/actions/doc/test_stdout.py/test/lookup_doc_with_ee/0.json b/tests/fixtures/integration/actions/doc/test_stdout.py/test/lookup_doc_with_ee/0.json index 15a1c11df..c25536d24 100644 --- a/tests/fixtures/integration/actions/doc/test_stdout.py/test/lookup_doc_with_ee/0.json +++ b/tests/fixtures/integration/actions/doc/test_stdout.py/test/lookup_doc_with_ee/0.json @@ -32,6 +32,7 @@ " \"type\": \"str\"", " }", " },", + " \"plugin_name\": \"company_name.coll_1.lookup_1\",", " \"plugin_type\": \"lookup\",", " \"short_description\": \"This is test lookup plugin\",", " \"version_added\": \"1.0.0\",", diff --git a/tests/fixtures/integration/actions/doc/test_stdout.py/test/module_doc_with_ee/0.json b/tests/fixtures/integration/actions/doc/test_stdout.py/test/module_doc_with_ee/0.json index 58fcce46a..d16e2cc6b 100644 --- a/tests/fixtures/integration/actions/doc/test_stdout.py/test/module_doc_with_ee/0.json +++ b/tests/fixtures/integration/actions/doc/test_stdout.py/test/module_doc_with_ee/0.json @@ -41,6 +41,7 @@ " \"type\": \"str\"", " }", " },", + " \"plugin_name\": \"company_name.coll_1.mod_1\",", " \"short_description\": \"This is a test module\",", " \"version_added\": \"1.0.0\",", " \"version_added_collection\": \"company_name.coll_1\"", diff --git a/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/filter_doc_pass/1.json b/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/filter_doc_pass/1.json index de4a07dcf..8bf42bb00 100644 --- a/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/filter_doc_pass/1.json +++ b/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/filter_doc_pass/1.json @@ -14,12 +14,13 @@ " 7│ name: filter_1", " 8│ notes:", " 9│ - This is a dummy filter plugin", - "10│ short_description: This is test filter plugin", - "11│ version_added: 1.0.0", - "12│ version_added_collection: company_name.coll_1", - "13│examples: null", - "14│metadata: null", - "15│return: null", + "10│ plugin_name: company_name.coll_1.filter_1", + "11│ short_description: This is test filter plugin", + "12│ version_added: 1.0.0", + "13│ version_added_collection: company_name.coll_1", + "14│examples: null", + "15│metadata: null", + "16│return: null", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] diff --git a/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/lookup_doc_pass/1.json b/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/lookup_doc_pass/1.json index 1161cd915..9fc3e12b5 100644 --- a/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/lookup_doc_pass/1.json +++ b/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/lookup_doc_pass/1.json @@ -25,19 +25,20 @@ "18│ - Dummy option I(foo)", "19│ required: true", "20│ type: str", - "21│ plugin_type: lookup", - "22│ short_description: This is test lookup plugin", - "23│ version_added: 1.0.0", - "24│ version_added_collection: company_name.coll_1", - "25│examples: |-", - "26│ - name: Retrieve a value deep inside a using a path", - "27│ ansible.builtin.set_fact:", - "28│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"", - "29│metadata: null", - "30│return:", - "31│ _raw:", - "32│ description:", - "33│ - One or more zero-based indices of the matching list items.", + "21│ plugin_name: company_name.coll_1.lookup_1", + "22│ plugin_type: lookup", + "23│ short_description: This is test lookup plugin", + "24│ version_added: 1.0.0", + "25│ version_added_collection: company_name.coll_1", + "26│examples: |-", + "27│ - name: Retrieve a value deep inside a using a path", + "28│ ansible.builtin.set_fact:", + "29│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"", + "30│metadata: null", + "31│return:", + "32│ _raw:", + "33│ description:", + "34│ - One or more zero-based indices of the matching list items.", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] diff --git a/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/module_doc_pass/1.json b/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/module_doc_pass/1.json index 051884682..85b94e94b 100644 --- a/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/module_doc_pass/1.json +++ b/tests/fixtures/integration/actions/doc/test_welcome_interactive_ee.py/test/module_doc_pass/1.json @@ -31,23 +31,24 @@ "24│ description:", "25│ - Dummy option I(foo)", "26│ type: str", - "27│ short_description: This is a test module", - "28│ version_added: 1.0.0", - "29│ version_added_collection: company_name.coll_1", - "30│examples: |-", - "31│ - name: test task-1", - "32│ company_name.coll_1.mod_1:", - "33│ foo: somevalue", - "34│ bar: candidate", - "35│metadata: null", - "36│return:", - "37│ baz:", - "38│ description: test return 1", - "39│ returned: success", - "40│ sample:", - "41│ - a", - "42│ - b", - "43│ type: list", + "27│ plugin_name: company_name.coll_1.mod_1", + "28│ short_description: This is a test module", + "29│ version_added: 1.0.0", + "30│ version_added_collection: company_name.coll_1", + "31│examples: |-", + "32│ - name: test task-1", + "33│ company_name.coll_1.mod_1:", + "34│ foo: somevalue", + "35│ bar: candidate", + "36│metadata: null", + "37│return:", + "38│ baz:", + "39│ description: test return 1", + "40│ returned: success", + "41│ sample:", + "42│ - a", + "43│ - b", + "44│ type: list", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json index aba435277..7e2edeb47 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json @@ -8,12 +8,12 @@ "compared_fixture": true }, "output": [ - " Name Default Source Current", - "0│Exec command True Defaults /bin/bash", - "1│Exec shell True Defaults True", - "2│Execution environment True Command line True", - "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", - "4│Execution environment volume mounts True Not set Not set", + " Name Default Source Current", + "0│Exec command True Defaults /bin/bash", + "1│Exec shell True Defaults True", + "2│Execution environment True Command line True", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", + "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json index 7b953906a..98af81491 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json @@ -15,9 +15,9 @@ " 3│ long: --execution-environment-image ▒", " 4│ short: --eei ▒", " 5│current_settings_file: None ▒", - " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", + " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 7│default: true ▒", - " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", + " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 9│description: Specify the name of the execution environment image ▒", "10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒", "11│name: Execution environment image ▒", diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json index 44a4a1a20..4523a3d6c 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json @@ -8,12 +8,12 @@ "compared_fixture": true }, "output": [ - " Name Default Source Current", - "0│Exec command True Defaults /bin/bash", - "1│Exec shell True Defaults True", - "2│Execution environment True Command line True", - "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", - "4│Execution environment volume mounts True Not set Not set", + " Name Default Source Current", + "0│Exec command True Defaults /bin/bash", + "1│Exec shell True Defaults True", + "2│Execution environment True Command line True", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", + "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } From 126096c4310695006975cc4aabb161ec62ff6665 Mon Sep 17 00:00:00 2001 From: "Bradley A. Thornton" Date: Mon, 15 Jul 2024 08:32:25 -0700 Subject: [PATCH 07/12] Test updates --- tests/integration/conftest.py | 1 + tests/unit/image_manager/test_image_puller.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index b71398727..4729317b1 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -86,6 +86,7 @@ def _apply_parameters(self) -> None: Parameter(name="log_append", value=False), Parameter(name="log_file", value=generate_test_log_dir(self.request)), Parameter(name="mode", value="stdout"), + Parameter(name="pull_policy", value="never"), ) for parameter in default_parameters: self._apply_parameter(parameter) diff --git a/tests/unit/image_manager/test_image_puller.py b/tests/unit/image_manager/test_image_puller.py index f14f96671..df88aa8dc 100644 --- a/tests/unit/image_manager/test_image_puller.py +++ b/tests/unit/image_manager/test_image_puller.py @@ -20,12 +20,12 @@ class TstPullPolicy(NamedTuple): pull_required: bool -# Note, these tests assume our default is not a :latest +# Note, these tests assume our default is a :latest data_do_have = [ pytest.param(TstPullPolicy(pull_policy="always", pull_required=True), id="always"), pytest.param(TstPullPolicy(pull_policy="missing", pull_required=False), id="missing"), pytest.param(TstPullPolicy(pull_policy="never", pull_required=False), id="never"), - pytest.param(TstPullPolicy(pull_policy="tag", pull_required=False), id="tag"), + pytest.param(TstPullPolicy(pull_policy="tag", pull_required=True), id="tag"), ] From fb410d7216bdad7eb77f95170921c201b387133c Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Mon, 15 Jul 2024 22:36:23 +0530 Subject: [PATCH 08/12] more test fixes --- .../test_direct_interactive_ee.py/test/0.json | 2 +- .../test/3.json | 2 +- .../test/filter_doc_pass/0.json | 13 +++---- .../test/lookup_doc_pass/0.json | 27 +++++++------- .../test/module_doc_pass/0.json | 35 ++++++++++--------- .../test/5.json | 12 +++---- .../test/6.json | 12 +++---- 7 files changed, 53 insertions(+), 50 deletions(-) diff --git a/tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/0.json b/tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/0.json index 5631fb93a..81efd9fc1 100644 --- a/tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/0.json +++ b/tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/0.json @@ -16,7 +16,7 @@ " 4│Ansible cow path True default None", " 5│Ansible cow selection True default default", " 6│Ansible force color True default False", - " 7│Ansible home True default /home/runner/.ansible", + " 7│Ansible home True default /root/.ansible", " 8│Ansible nocolor True default False", " 9│Ansible nocows True default False", " 10│Ansible pipelining True default False", diff --git a/tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/3.json b/tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/3.json index 4a661a308..ef1435809 100644 --- a/tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/3.json +++ b/tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/3.json @@ -14,7 +14,7 @@ " 2│current_value: 42", " 3│default: false", " 4│default_value: 86400", - " 5│description: Expiration timeout for the cache plugin data", + " 5│description: Expiration timeout for the cache plugin data.", " 6│env:", " 7│- name: ANSIBLE_CACHE_PLUGIN_TIMEOUT", " 8│ini:", diff --git a/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/filter_doc_pass/0.json b/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/filter_doc_pass/0.json index a85456720..d987b03f1 100644 --- a/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/filter_doc_pass/0.json +++ b/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/filter_doc_pass/0.json @@ -14,12 +14,13 @@ " 7│ name: filter_1", " 8│ notes:", " 9│ - This is a dummy filter plugin", - "10│ short_description: This is test filter plugin", - "11│ version_added: 1.0.0", - "12│ version_added_collection: company_name.coll_1", - "13│examples: null", - "14│metadata: null", - "15│return: null", + "10│ plugin_name: company_name.coll_1.filter_1", + "11│ short_description: This is test filter plugin", + "12│ version_added: 1.0.0", + "13│ version_added_collection: company_name.coll_1", + "14│examples: null", + "15│metadata: null", + "16│return: null", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] diff --git a/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/lookup_doc_pass/0.json b/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/lookup_doc_pass/0.json index b2e0bcc9a..8141a6995 100644 --- a/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/lookup_doc_pass/0.json +++ b/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/lookup_doc_pass/0.json @@ -25,19 +25,20 @@ "18│ - Dummy option I(foo)", "19│ required: true", "20│ type: str", - "21│ plugin_type: lookup", - "22│ short_description: This is test lookup plugin", - "23│ version_added: 1.0.0", - "24│ version_added_collection: company_name.coll_1", - "25│examples: |-", - "26│ - name: Retrieve a value deep inside a using a path", - "27│ ansible.builtin.set_fact:", - "28│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"", - "29│metadata: null", - "30│return:", - "31│ _raw:", - "32│ description:", - "33│ - One or more zero-based indices of the matching list items.", + "21│ plugin_name: company_name.coll_1.lookup_1", + "22│ plugin_type: lookup", + "23│ short_description: This is test lookup plugin", + "24│ version_added: 1.0.0", + "25│ version_added_collection: company_name.coll_1", + "26│examples: |-", + "27│ - name: Retrieve a value deep inside a using a path", + "28│ ansible.builtin.set_fact:", + "29│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"", + "30│metadata: null", + "31│return:", + "32│ _raw:", + "33│ description:", + "34│ - One or more zero-based indices of the matching list items.", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] diff --git a/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/module_doc_pass/0.json b/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/module_doc_pass/0.json index 5c2ecbde0..de7af6d99 100644 --- a/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/module_doc_pass/0.json +++ b/tests/fixtures/integration/actions/doc/test_direct_interactive_ee.py/test/module_doc_pass/0.json @@ -31,23 +31,24 @@ "24│ description:", "25│ - Dummy option I(foo)", "26│ type: str", - "27│ short_description: This is a test module", - "28│ version_added: 1.0.0", - "29│ version_added_collection: company_name.coll_1", - "30│examples: |-", - "31│ - name: test task-1", - "32│ company_name.coll_1.mod_1:", - "33│ foo: somevalue", - "34│ bar: candidate", - "35│metadata: null", - "36│return:", - "37│ baz:", - "38│ description: test return 1", - "39│ returned: success", - "40│ sample:", - "41│ - a", - "42│ - b", - "43│ type: list", + "27│ plugin_name: company_name.coll_1.mod_1", + "28│ short_description: This is a test module", + "29│ version_added: 1.0.0", + "30│ version_added_collection: company_name.coll_1", + "31│examples: |-", + "32│ - name: test task-1", + "33│ company_name.coll_1.mod_1:", + "34│ foo: somevalue", + "35│ bar: candidate", + "36│metadata: null", + "37│return:", + "38│ baz:", + "39│ description: test return 1", + "40│ returned: success", + "41│ sample:", + "42│ - a", + "43│ - b", + "44│ type: list", "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json index 576780a03..37b900a8e 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json @@ -8,12 +8,12 @@ "compared_fixture": true }, "output": [ - " Name Default Source Current", - "0│Exec command True Defaults /bin/bash", - "1│Exec shell True Defaults True", - "2│Execution environment False Command line False", - "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", - "4│Execution environment volume mounts True Not set Not set", + " Name Default Source Current", + "0│Exec command True Defaults /bin/bash", + "1│Exec shell True Defaults True", + "2│Execution environment False Command line False", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", + "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/6.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/6.json index 9071db0ab..4f0c1bd83 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/6.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/6.json @@ -8,12 +8,12 @@ "compared_fixture": true }, "output": [ - " Name Default Source Current", - "0│Exec command True Defaults /bin/bash", - "1│Exec shell True Defaults True", - "2│Execution environment True Command line True", - "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", - "4│Execution environment volume mounts True Not set Not set", + " Name Default Source Current", + "0│Exec command True Defaults /bin/bash", + "1│Exec shell True Defaults True", + "2│Execution environment True Command line True", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", + "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } From 396bda0a41fbf2d48903a66dd069492946bb248f Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Mon, 15 Jul 2024 23:01:23 +0530 Subject: [PATCH 09/12] more test fixes: part2 --- .../config/test_direct_interactive_ee.py/test/2.json | 2 +- .../test/0.json | 2 +- .../test_direct_interactive_noee.py/test/6.json | 4 ++-- .../test_welcome_interactive_ee.py/test/7.json | 4 ++-- .../test_welcome_interactive_noee.py/test/6.json | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/2.json b/tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/2.json index 9cd0c5ba8..bc388b050 100644 --- a/tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/2.json +++ b/tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/2.json @@ -14,7 +14,7 @@ " 2│current_value: 42", " 3│default: false", " 4│default_value: 86400", - " 5│description: Expiration timeout for the cache plugin data", + " 5│description: Expiration timeout for the cache plugin data.", " 6│env:", " 7│- name: ANSIBLE_CACHE_PLUGIN_TIMEOUT", " 8│ini:", diff --git a/tests/fixtures/integration/actions/config/test_direct_interactive_ee_using_cfg.py/test/0.json b/tests/fixtures/integration/actions/config/test_direct_interactive_ee_using_cfg.py/test/0.json index 854431162..19ddd018b 100644 --- a/tests/fixtures/integration/actions/config/test_direct_interactive_ee_using_cfg.py/test/0.json +++ b/tests/fixtures/integration/actions/config/test_direct_interactive_ee_using_cfg.py/test/0.json @@ -16,7 +16,7 @@ " 4│Ansible cow path True default None", " 5│Ansible cow selection True default default", " 6│Ansible force color True default False", - " 7│Ansible home True default /home/runner/.ansible", + " 7│Ansible home True default /root/.ansible", " 8│Ansible nocolor True default False", " 9│Ansible nocows True default False", " 10│Ansible pipelining True default False", diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/6.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/6.json index 7b953906a..98af81491 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/6.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/6.json @@ -15,9 +15,9 @@ " 3│ long: --execution-environment-image ▒", " 4│ short: --eei ▒", " 5│current_settings_file: None ▒", - " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", + " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 7│default: true ▒", - " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", + " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 9│description: Specify the name of the execution environment image ▒", "10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒", "11│name: Execution environment image ▒", diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/7.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/7.json index dffa9cee5..40cf4c97d 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/7.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/7.json @@ -15,9 +15,9 @@ " 3│ long: --execution-environment-image ▒", " 4│ short: --eei ▒", " 5│current_settings_file: None ▒", - " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", + " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 7│default: true ▒", - " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", + " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 9│description: Specify the name of the execution environment image ▒", "10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒", "11│name: Execution environment image ▒", diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/6.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/6.json index 4ba219a8a..ece03be52 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/6.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/6.json @@ -8,12 +8,12 @@ "compared_fixture": true }, "output": [ - " Name Default Source Current", - "0│Exec command True Defaults /bin/bash", - "1│Exec shell True Defaults True", - "2│Execution environment False Command line False", - "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", - "4│Execution environment volume mounts True Not set Not set", + " Name Default Source Current", + "0│Exec command True Defaults /bin/bash", + "1│Exec shell True Defaults True", + "2│Execution environment False Command line False", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", + "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } From e9fc8e42b5c3f2a3fed0c9ed186f35d423b01199 Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Tue, 16 Jul 2024 09:13:23 +0530 Subject: [PATCH 10/12] more test fixes: part3 --- .../test_direct_interactive_noee.py/test/7.json | 12 ++++++------ .../test_welcome_interactive_ee.py/test/8.json | 12 ++++++------ .../test_welcome_interactive_noee.py/test/7.json | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/7.json b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/7.json index 793adbbe9..6397f3675 100644 --- a/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/7.json +++ b/tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/7.json @@ -8,12 +8,12 @@ "compared_fixture": true }, "output": [ - " Name Default Source Current", - "0│Exec command True Defaults /bin/bash", - "1│Exec shell True Defaults True", - "2│Execution environment False Command line False", - "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", - "4│Execution environment volume mounts True Not set Not set", + " Name Default Source Current", + "0│Exec command True Defaults /bin/bash", + "1│Exec shell True Defaults True", + "2│Execution environment False Command line False", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", + "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/8.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/8.json index 875417eee..e789888bf 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/8.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_ee.py/test/8.json @@ -8,12 +8,12 @@ "compared_fixture": true }, "output": [ - " Name Default Source Current", - "0│Exec command True Defaults /bin/bash", - "1│Exec shell True Defaults True", - "2│Execution environment True Command line True", - "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", - "4│Execution environment volume mounts True Not set Not set", + " Name Default Source Current", + "0│Exec command True Defaults /bin/bash", + "1│Exec shell True Defaults True", + "2│Execution environment True Command line True", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", + "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/7.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/7.json index dffa9cee5..40cf4c97d 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/7.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/7.json @@ -15,9 +15,9 @@ " 3│ long: --execution-environment-image ▒", " 4│ short: --eei ▒", " 5│current_settings_file: None ▒", - " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", + " 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 7│default: true ▒", - " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", + " 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:latest ▒", " 9│description: Specify the name of the execution environment image ▒", "10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒", "11│name: Execution environment image ▒", From e6d5faf89534995c4bc8008b4843037370eaf98d Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Tue, 16 Jul 2024 11:23:30 +0530 Subject: [PATCH 11/12] more test fixes: part4 --- .../test_welcome_interactive_noee.py/test/8.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/8.json b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/8.json index ac3e42f14..0b74918e8 100644 --- a/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/8.json +++ b/tests/fixtures/integration/actions/settings/test_welcome_interactive_noee.py/test/8.json @@ -8,12 +8,12 @@ "compared_fixture": true }, "output": [ - " Name Default Source Current", - "0│Exec command True Defaults /bin/bash", - "1│Exec shell True Defaults True", - "2│Execution environment False Command line False", - "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", - "4│Execution environment volume mounts True Not set Not set", + " Name Default Source Current", + "0│Exec command True Defaults /bin/bash", + "1│Exec shell True Defaults True", + "2│Execution environment False Command line False", + "3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:latest", + "4│Execution environment volume mounts True Not set Not set", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } From c30a9ca1cb8b61acf7697cff820bd0b1f34f5733 Mon Sep 17 00:00:00 2001 From: shatakshiiii Date: Tue, 16 Jul 2024 13:33:08 +0530 Subject: [PATCH 12/12] more test fixes: part5 --- .../test/0.json | 13 ++-- .../test/1.json | 6 +- .../test/2.json | 6 +- .../test/3.json | 14 ++-- .../test/4.json | 8 +-- .../test/5.json | 14 ++-- .../test/6.json | 68 ++----------------- .../test_direct_interactive_ee_readme.py | 20 +++--- 8 files changed, 45 insertions(+), 104 deletions(-) diff --git a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/0.json b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/0.json index dbae8448c..fe00e5544 100644 --- a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/0.json +++ b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/0.json @@ -12,14 +12,11 @@ }, "output": [ " Name Version Shadowed Type Path", - "0│ansible.builtin 2.14.1 False contained /usr/local/lib/python3.XX/site-packages/ansible", - "1│ansible.posix 1.5.1 False contained /usr/share/ansible/collections/ansible_collections/ansible/posix", - "2│ansible.windows 1.13.0 False contained /usr/share/ansible/collections/ansible_collections/ansible/windows", - "3│awx.awx 21.11.0 False contained /usr/share/ansible/collections/ansible_collections/awx/awx", - "4│containers.podman 1.10.1 False contained /usr/share/ansible/collections/ansible_collections/containers/podman", - "5│kubernetes.core 2.4.0 False contained /usr/share/ansible/collections/ansible_collections/kubernetes/core", - "6│redhatinsights.insights 1.0.7 False contained /usr/share/ansible/collections/ansible_collections/redhatinsights/insights", - "7│theforeman.foreman 3.8.0 False contained /usr/share/ansible/collections/ansible_collections/theforeman/foreman", + "0│ansible.builtin 2.17.1 False contained /usr/local/lib/python3.XX/site-packages/ansible", + "1│ansible.netcommon 7.0.0 False contained /usr/share/ansible/collections/ansible_collections/ansible/netcommon", + "2│ansible.posix 1.5.4 False contained /usr/share/ansible/collections/ansible_collections/ansible/posix", + "3│ansible.scm 2.0.0 False contained /usr/share/ansible/collections/ansible_collections/ansible/scm", + "4│ansible.utils 5.0.0 False contained /usr/share/ansible/collections/ansible_collections/ansible/utils", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/1.json b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/1.json index 05766ea16..93b9c9905 100644 --- a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/1.json +++ b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/1.json @@ -1,17 +1,17 @@ { - "name": "test[1-:f redhatinsights.insights-filter collections]", + "name": "test[1-:f ansible.posix-filter collections]", "index": 1, "comment": "filter collections", "additional_information": { "present": [ - "redhatinsights.insights" + "ansible.posix" ], "absent": [], "compared_fixture": false }, "output": [ " Name Version Shadowed Type Path", - "0│redhatinsights.insights 1.0.7 False contained /usr/share/ansible/collections/ansible_collections/redhatinsights/insights", + "0│ansible.posix 1.5.4 False contained /usr/share/ansible/collections/ansible_collections/ansible/posix", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/2.json b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/2.json index a01a799df..89fe126e7 100644 --- a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/2.json +++ b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/2.json @@ -1,14 +1,14 @@ { - "name": "test[2-:0-select redhatinsights.insights]", + "name": "test[2-:0-select ansible.posix]", "index": 2, - "comment": "select redhatinsights.insights", + "comment": "select ansible.posix", "additional_information": { "present": [], "absent": [], "compared_fixture": true }, "output": [ - " Redhatinsights.insights Type Added Deprecated Description", + " Ansible.posix Type Added Deprecated Description", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/3.json b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/3.json index 7790e385f..f88cd8920 100644 --- a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/3.json +++ b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/3.json @@ -4,18 +4,18 @@ "comment": "unfiltered", "additional_information": { "present": [ - "compliance" + "csh" ], "absent": [], "compared_fixture": false }, "output": [ - " Redhatinsights.insights Type Added Deprecated Description", - "0│compliance role Unknown Unknown Install and configure Red Hat Insights Client", - "1│insights inventory None False insights inventory source", - "2│insights_client role Unknown Unknown Install and configure Red Hat Insights Client", - "3│insights_config module None False This module handles initial configuration of the insights client on install", - "4│insights_register module None False This module registers the insights client", + " Ansible.posix Type Added Deprecated Description", + "0│acl module 1.0.0 False Set and retrieve file ACL information.", + "1│at module 1.0.0 False Schedule the execution of a command or script file", + "2│authorized_key module 1.0.0 False Adds or removes an SSH authorized key", + "3│cgroup_perf_recap callback None False Profiles system activity of tasks and full execution", + "4│csh shell None False C shell (/bin/csh)", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/4.json b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/4.json index 89ae41a37..6c03148ab 100644 --- a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/4.json +++ b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/4.json @@ -1,17 +1,17 @@ { - "name": "test[4-:f compliance-filter content]", + "name": "test[4-:f csh-filter content]", "index": 4, "comment": "filter content", "additional_information": { "present": [ - "compliance" + "csh" ], "absent": [], "compared_fixture": false }, "output": [ - " Redhatinsights.insights Type Added Deprecated Description", - "0│compliance role Unknown Unknown Install and configure Red Hat Insights Client", + " Ansible.posix Type Added Deprecated Description", + "0│csh shell None False C shell (/bin/csh)", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help" ] } diff --git a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/5.json b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/5.json index e6769ba74..6b9c14ee7 100644 --- a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/5.json +++ b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/5.json @@ -1,23 +1,23 @@ { - "name": "test[5-:0-select compliance]", + "name": "test[5-:0-select csh]", "index": 5, - "comment": "select compliance", + "comment": "select csh", "additional_information": { "present": [ - "full_name: redhatinsights.insights.compliance" + "full_name: ansible.posix.csh" ], "absent": [], "compared_fixture": false }, "output": [ - "Image: redhatinsights.insights.compliance", - "Description: Install and configure Red Hat Insights Client", + "Image: ansible.posix.csh", + "Description: C shell (/bin/csh)", " 0│---", " 1│argument_specs: {}", " 2│argument_specs_path: ''", " 3│defaults: {}", " 4│defaults_path: ''", - " 5│full_name: redhatinsights.insights.compliance", + " 5│full_name: ansible.posix.csh", " 6│info:", " 7│ galaxy_info:", " 8│ author: Red Hat, Inc", @@ -26,7 +26,7 @@ "11│ - system", "12│ company: Red Hat, Inc.", "13│ dependencies: []", - "14│ description: Install and configure Red Hat Insights Client", + "14│ description: Ansible Collection targeting POSIX and POSIX-ish platforms.", "15│ license: Apache License 2.0", "16│ min_ansible_version: 1.2", "17│ platforms:", diff --git a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/6.json b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/6.json index e0205cc3f..fe058cc54 100644 --- a/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/6.json +++ b/tests/fixtures/integration/actions/templar/test_direct_interactive_ee_readme.py/test/6.json @@ -1,76 +1,16 @@ { - "name": "test[6-:{{ readme }}-open readme]", + "name": "test[6-:{{ full_name }}-open full_name]", "index": 6, - "comment": "open readme", + "comment": "open full_name", "additional_information": { "present": [ - "OpenSCAP" + "ansible.posix.csh" ], "absent": [], "compared_fixture": false }, "output": [ - " 0│compliance", - " 1│========", - " 2│", - " 3│Installs, configures, and runs [OpenSCAP](https://www.open-scap.org) compliance on a system connected to the [Red Hat Insights service](https://access.redhat.com/documentation/en-us/red_hat_insights/). This role is intended to work on Red Hat Enterprise Linux.", - " 4│", - " 5│Requirements", - " 6│------------", - " 7│- The Insights client must be installed and configured prior to using the compliance service. See the [insights_client](../insights_client/README.md) role for automated deployment and configuration of the client.", - " 8│", - " 9│- The host must me configured in the [Insights portal](https://cloud.redhat.com/insights/compliance) prior to running a compliance scan.", - "10│", - "11│Role Variables / Configuration", - "12│--------------", - "13│", - "14│N/A", - "15│", - "16│Dependencies", - "17│------------", - "18│", - "19│N/A", - "20│", - "21│Example Playbook", - "22│----------------", - "23│", - "24│The role can be used in three ways from a playbook, install only, run only, or all-in-one. The all-in-one is most common and recommend usage as it will ensure all pre-requisites are met prior to running a compliance scan.", - "25│", - "26│", - "27│---", - "28│- hosts: all", - "29│", - "30│ tasks:", - "31│ - name: insights compliance", - "32│ import_role:", - "33│ name: redhat.insights.compliance", - "34│", - "35│", - "36│If you only wish to install pre-requisites without running a compliance scan the role may be used with only the \"install\" tasks as shown in the example below.", - "37│", - "38│", - "39│---", - "40│- hosts: all", - "41│", - "42│ tasks:", - "43│ - name: install insights compliance", - "44│ import_role:", - "45│ name: redhat.insights.compliance", - "46│ tasks_from: install", - "47│", - "48│", - "49│To speed up compliance scans after installation of prerequisites, the role may be run with only the \"run\" tasks as shown in the example below. Use caution when using this method as it can cause hosts to fail or become inconsistent with other hosts since prerequisites are not being checked and met prior to running a scan.", - "50│", - "51│", - "52│---", - "53│- hosts: all", - "54│", - "55│ tasks:", - "56│ - name: run insights compliance", - "57│ import_role:", - "58│ name: redhat.insights.compliance", - "59│ tasks_from: run", - "60│", + " 0│ansible.posix.csh", "^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help" ] } diff --git a/tests/integration/actions/templar/test_direct_interactive_ee_readme.py b/tests/integration/actions/templar/test_direct_interactive_ee_readme.py index 879b8f922..76f501a49 100644 --- a/tests/integration/actions/templar/test_direct_interactive_ee_readme.py +++ b/tests/integration/actions/templar/test_direct_interactive_ee_readme.py @@ -19,22 +19,26 @@ present=["ansible.builtin", "ansible.posix"], ), UiTestStep( - user_input=":f redhatinsights.insights", + user_input=":f ansible.posix", comment="filter collections", - present=["redhatinsights.insights"], + present=["ansible.posix"], ), UiTestStep( user_input=":0", - comment="select redhatinsights.insights", + comment="select ansible.posix", ), - UiTestStep(user_input=":f", comment="unfiltered", present=["compliance"]), - UiTestStep(user_input=":f compliance", comment="filter content", present=["compliance"]), + UiTestStep(user_input=":f", comment="unfiltered", present=["csh"]), + UiTestStep(user_input=":f csh", comment="filter content", present=["csh"]), UiTestStep( user_input=":0", - comment="select compliance", - present=["full_name: redhatinsights.insights.compliance"], + comment="select csh", + present=["full_name: ansible.posix.csh"], + ), + UiTestStep( + user_input=":{{ full_name }}", + comment="open full_name", + present=["ansible.posix.csh"], ), - UiTestStep(user_input=":{{ readme }}", comment="open readme", present=["OpenSCAP"]), ) steps = add_indices(steps)