fix(fill): allow lowercase fork declaration in fill command (#1969)

* allow lowercase fork declaration in fill command

* fix unit test by replacing merge with paris

* fix execute

* remove debug print

Author: felix314159

src/pytest_plugins/execute/rpc/hive.py

@@ -110,7 +110,7 @@ def get_fork_option(request, option_name: str) -> Fork | None:
         if option == "Merge":
             option = "Paris"
         for fork in get_forks():
-            if option == fork.name():
+            if option.lower() == fork.name().lower():
                 return fork
     return None
 

src/pytest_plugins/forks/forks.py

@@ -464,13 +464,13 @@ def get_fork_option(config, option_name: str, parameter_name: str) -> Set[Fork]:
             return set()
 
         forks_str = config_str.split(",")
-        forks_str = [s.strip() for s in config_str.split(",")]
+        forks_str = [s.strip().lower() for s in config_str.split(",")]
         # Alias for "Merge"
         forks_str = [("Paris" if s.lower() == "merge" else s) for s in forks_str]
 
         resulting_forks = set()
         for fork in config.all_forks_with_transitions:
-            if fork.name() in forks_str:
+            if fork.name().lower() in forks_str:
                 resulting_forks.add(fork)
 
         if len(resulting_forks) != len(forks_str):

src/pytest_plugins/forks/tests/test_forks.py

@@ -13,7 +13,7 @@ def fork_map():
     return {fork.name(): fork for fork in get_forks()}
 
 
-def test_no_options_no_validity_marker(pytester):
+def test_no_options_no_validity_marker(pytester: pytest.Pytester):
     """
     Test test parametrization with:
     - no fork command-line options,
@@ -61,7 +61,7 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
 
 
 @pytest.mark.parametrize("fork", ["London", "Paris"])
-def test_from_london_option_no_validity_marker(pytester, fork_map, fork):
+def test_from_london_option_no_validity_marker(pytester: pytest.Pytester, fork_map, fork):
     """
     Test test parametrization with:
     - --from London command-line option,
@@ -105,7 +105,7 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
     )
 
 
-def test_from_london_until_shanghai_option_no_validity_marker(pytester, fork_map):
+def test_from_london_until_shanghai_option_no_validity_marker(pytester: pytest.Pytester, fork_map):
     """
     Test test parametrization with:
     - --from London command-line option,
@@ -122,7 +122,7 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
     )
     pytester.copy_example(name="src/cli/pytest_commands/pytest_ini_files/pytest-fill.ini")
     result = pytester.runpytest(
-        "-c", "pytest-fill.ini", "-v", "--from", "London", "--until", "Shanghai"
+        "-c", "pytest-fill.ini", "-v", "--from", "London", "--until", "shanghai"
     )
     forks_under_test = forks_from_until(fork_map["London"], fork_map["Shanghai"])
     expected_passed = len(forks_under_test) * len(StateTest.supported_fixture_formats)
@@ -153,11 +153,11 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
     )
 
 
-def test_from_merge_until_merge_option_no_validity_marker(pytester, fork_map):
+def test_from_paris_until_paris_option_no_validity_marker(pytester: pytest.Pytester, fork_map):
     """
     Test test parametrization with:
-    - --from Merge command-line option,
-    - --until Merge command-line option,
+    - --from Paris command-line option,
+    - --until Paris command-line option,
     - no fork validity marker.
     """
     pytester.makepyfile(
@@ -170,11 +170,13 @@ def test_all_forks({StateTest.pytest_parameter_name()}):
     )
     pytester.copy_example(name="src/cli/pytest_commands/pytest_ini_files/pytest-fill.ini")
     result = pytester.runpytest(
-        "-c", "pytest-fill.ini", "-v", "--from", "Merge", "--until", "Merge"
+        "-c", "pytest-fill.ini", "-v", "--from", "paris", "--until", "paris"
     )
     forks_under_test = forks_from_until(fork_map["Paris"], fork_map["Paris"])
     expected_passed = len(forks_under_test) * len(StateTest.supported_fixture_formats)
-    stdout = "\n".join(result.stdout.lines)
+    stdout: str = "\n".join(result.stdout.lines)
+    assert len(stdout) > 0, "stdout is empty string"
+
     for fork in forks_under_test:
         for fixture_format in StateTest.supported_fixture_formats:
             if isinstance(fixture_format, LabeledFixtureFormat):