Update ids for parametrized functional tests

SatelliteQE · Apr 9, 2024 · 854b5f2 · 854b5f2
1 parent 33d6dff
commit 854b5f2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/tests/functional/test_containers.py b/tests/functional/test_containers.py
@@ -32,15 +32,15 @@ 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])
     assert result.exit_code == 0
 
 
 @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
@@ -29,15 +29,15 @@ 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])
     assert result.exit_code == 0
 
 
 # @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
@@ -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,15 +32,15 @@ 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])
     assert result.exit_code == 0
 
 
 @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])