From 73abe43d7e399a76750fc8686f5566b133297e80 Mon Sep 17 00:00:00 2001 From: s-hertel <19572925+s-hertel@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:29:36 -0500 Subject: [PATCH] Remove no-op flags from the ansible-galaxy unit tests --- test/units/cli/test_galaxy.py | 7 +++---- test/units/galaxy/test_collection.py | 2 +- test/units/galaxy/test_collection_install.py | 2 +- test/units/galaxy/test_role_install.py | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py index 84908b96f28..a0f2291541e 100644 --- a/test/units/cli/test_galaxy.py +++ b/test/units/cli/test_galaxy.py @@ -64,7 +64,7 @@ class TestGalaxy(unittest.TestCase): shutil.rmtree("./delete_me", ignore_errors=True) # creating framework for a role - gc = GalaxyCLI(args=["ansible-galaxy", "init", "--offline", "delete_me"]) + gc = GalaxyCLI(args=["ansible-galaxy", "init", "delete_me"]) gc.run() cls.role_dir = "./delete_me" cls.role_name = "delete_me" @@ -215,7 +215,6 @@ class TestGalaxy(unittest.TestCase): """ testing the options parser when the action 'init' is given """ gc = GalaxyCLI(args=["ansible-galaxy", "init", "foo"]) gc.parse() - assert not context.CLIARGS['offline'] assert not context.CLIARGS['force'] def test_parse_install(self): @@ -279,7 +278,7 @@ class ValidRoleTests(object): args = ['ansible-galaxy'] if use_explicit_type: args += ['role'] - args += ['init', '-c', '--offline'] + galaxy_args + ['--init-path', cls.test_dir, cls.role_name] + args += ['init'] + galaxy_args + ['--init-path', cls.test_dir, cls.role_name] gc = GalaxyCLI(args=args) gc.run() @@ -480,7 +479,7 @@ def test_verbosity_arguments(cli_args, expected, monkeypatch): def collection_skeleton(request, tmp_path_factory): name, skeleton_path = request.param - galaxy_args = ['ansible-galaxy', 'collection', 'init', '-c'] + galaxy_args = ['ansible-galaxy', 'collection', 'init'] if skeleton_path is not None: galaxy_args += ['--collection-skeleton', skeleton_path] diff --git a/test/units/galaxy/test_collection.py b/test/units/galaxy/test_collection.py index 0c00c1884ba..04961185d7e 100644 --- a/test/units/galaxy/test_collection.py +++ b/test/units/galaxy/test_collection.py @@ -54,7 +54,7 @@ def collection_input(tmp_path_factory, collection_path_suffix): skeleton = os.path.join(os.path.dirname(os.path.split(__file__)[0]), 'cli', 'test_data', 'collection_skeleton') galaxy_args = ['ansible-galaxy', 'collection', 'init', '%s.%s' % (namespace, collection), - '-c', '--init-path', test_dir, '--collection-skeleton', skeleton] + '--init-path', test_dir, '--collection-skeleton', skeleton] GalaxyCLI(args=galaxy_args).run() collection_dir = os.path.join(test_dir, namespace, collection) output_dir = to_text(tmp_path_factory.mktemp('test-ÅÑŚÌβŁÈ Collections Output')) diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py index dc6dbe5b6f3..070b14f826e 100644 --- a/test/units/galaxy/test_collection_install.py +++ b/test/units/galaxy/test_collection_install.py @@ -69,7 +69,7 @@ def collection_artifact(request, tmp_path_factory): skeleton_path = os.path.join(os.path.dirname(os.path.split(__file__)[0]), 'cli', 'test_data', 'collection_skeleton') collection_path = os.path.join(test_dir, namespace, collection) - call_galaxy_cli(['init', '%s.%s' % (namespace, collection), '-c', '--init-path', test_dir, + call_galaxy_cli(['init', '%s.%s' % (namespace, collection), '--init-path', test_dir, '--collection-skeleton', skeleton_path]) dependencies = getattr(request, 'param', {}) diff --git a/test/units/galaxy/test_role_install.py b/test/units/galaxy/test_role_install.py index 8e77352a30f..4a1d1dd7fc5 100644 --- a/test/units/galaxy/test_role_install.py +++ b/test/units/galaxy/test_role_install.py @@ -48,7 +48,7 @@ def init_role_dir(tmp_path_factory): namespace = 'ansible_namespace' role = 'role' skeleton_path = os.path.join(os.path.dirname(os.path.split(__file__)[0]), 'cli', 'test_data', 'role_skeleton') - call_galaxy_cli(['init', '%s.%s' % (namespace, role), '-c', '--init-path', test_dir, '--role-skeleton', skeleton_path]) + call_galaxy_cli(['init', '%s.%s' % (namespace, role), '--init-path', test_dir, '--role-skeleton', skeleton_path]) def mock_NamedTemporaryFile(mocker, **args):