From 854b5f2865814bd81f36d96597cbef5ab4f3d7ad Mon Sep 17 00:00:00 2001 From: Tasos Papaioannou Date: Tue, 9 Apr 2024 10:31:37 -0400 Subject: [PATCH] Update ids for parametrized functional tests --- tests/functional/test_containers.py | 4 ++-- tests/functional/test_rh_beaker.py | 4 ++-- tests/functional/test_satlab.py | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/functional/test_containers.py b/tests/functional/test_containers.py index 61cd5d91..89d86fab 100644 --- a/tests/functional/test_containers.py +++ b/tests/functional/test_containers.py @@ -32,7 +32,7 @@ def temp_inventory(): @pytest.mark.parametrize( - "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("checkout_")] + "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("checkout_")], ids=lambda f: f.name.split(".")[0] ) def test_checkout_scenarios(args_file, temp_inventory): result = CliRunner().invoke(cli, ["checkout", "--args-file", args_file]) @@ -40,7 +40,7 @@ def test_checkout_scenarios(args_file, temp_inventory): @pytest.mark.parametrize( - "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("execute_")] + "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("execute_")], ids=lambda f: f.name.split(".")[0] ) def test_execute_scenarios(args_file): result = CliRunner().invoke(cli, ["execute", "--args-file", args_file]) diff --git a/tests/functional/test_rh_beaker.py b/tests/functional/test_rh_beaker.py index 5aa39daf..89098d71 100644 --- a/tests/functional/test_rh_beaker.py +++ b/tests/functional/test_rh_beaker.py @@ -29,7 +29,7 @@ def temp_inventory(): @pytest.mark.parametrize( - "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("checkout_")] + "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("checkout_")], ids=lambda f: f.name.split(".")[0] ) def test_checkout_scenarios(args_file, temp_inventory): result = CliRunner().invoke(cli, ["checkout", "--args-file", args_file]) @@ -37,7 +37,7 @@ def test_checkout_scenarios(args_file, temp_inventory): # @pytest.mark.parametrize( -# "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("execute_")] +# "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("execute_")], ids=lambda f: f.name.split(".")[0] # ) # def test_execute_scenarios(args_file): # result = CliRunner().invoke(cli, ["execute", "--args-file", args_file]) diff --git a/tests/functional/test_satlab.py b/tests/functional/test_satlab.py index b4a223b0..9652d4e8 100644 --- a/tests/functional/test_satlab.py +++ b/tests/functional/test_satlab.py @@ -1,14 +1,15 @@ from pathlib import Path from tempfile import NamedTemporaryFile + import pytest from click.testing import CliRunner + from broker import Broker from broker.commands import cli +from broker.hosts import Host from broker.providers.ansible_tower import AnsibleTower from broker.settings import inventory_path -from broker.hosts import Host - SCENARIO_DIR = Path("tests/data/cli_scenarios/satlab") @@ -31,7 +32,7 @@ def temp_inventory(): @pytest.mark.parametrize( - "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("checkout_")] + "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("checkout_")], ids=lambda f: f.name.split(".")[0] ) def test_checkout_scenarios(args_file, temp_inventory): result = CliRunner().invoke(cli, ["checkout", "--args-file", args_file]) @@ -39,7 +40,7 @@ def test_checkout_scenarios(args_file, temp_inventory): @pytest.mark.parametrize( - "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("execute_")] + "args_file", [f for f in SCENARIO_DIR.iterdir() if f.name.startswith("execute_")], ids=lambda f: f.name.split(".")[0] ) def test_execute_scenarios(args_file): result = CliRunner().invoke(cli, ["execute", "--args-file", args_file])