Update creation of test package that must fail building

Author: sbidoul

tests/functional/test_new_resolver.py

@@ -2463,7 +2463,7 @@ def test_new_resolver_constraint_on_link_with_extra_indirect(
 def test_new_resolver_do_not_backtrack_on_build_failure(
     script: PipTestEnvironment,
 ) -> None:
-    create_basic_sdist_for_package(script, "pkg1", "2.0", fails_egg_info=True)
+    create_basic_sdist_for_package(script, "pkg1", "2.0", fails_build=True)
     create_basic_wheel_for_package(script, "pkg1", "1.0")
 
     result = script.pip(
@@ -2476,14 +2476,14 @@ def test_new_resolver_do_not_backtrack_on_build_failure(
         expect_error=True,
     )
 
-    assert "egg_info" in result.stderr
+    assert "Failed to build 'pkg1'" in result.stderr
 
 
 def test_new_resolver_works_when_failing_package_builds_are_disallowed(
     script: PipTestEnvironment,
 ) -> None:
     create_basic_wheel_for_package(script, "pkg2", "1.0", depends=["pkg1"])
-    create_basic_sdist_for_package(script, "pkg1", "2.0", fails_egg_info=True)
+    create_basic_sdist_for_package(script, "pkg1", "2.0", fails_build=True)
     create_basic_wheel_for_package(script, "pkg1", "1.0")
     constraints_file = script.scratch_path / "constraints.txt"
     constraints_file.write_text("pkg1 != 2.0")

tests/lib/__init__.py

@@ -1213,8 +1213,7 @@ def create_basic_sdist_for_package(
     version: str,
     extra_files: dict[str, str] | None = None,
     *,
-    fails_egg_info: bool = False,
-    fails_bdist_wheel: bool = False,
+    fails_build: bool = False,
     depends: list[str] | None = None,
     setup_py_prelude: str = "",
 ) -> pathlib.Path:
@@ -1226,14 +1225,10 @@ def create_basic_sdist_for_package(
 
             {setup_py_prelude}
 
-            fails_bdist_wheel = {fails_bdist_wheel!r}
-            fails_egg_info = {fails_egg_info!r}
+            fails_build = {fails_build!r}
 
-            if fails_egg_info and "egg_info" in sys.argv:
-                raise Exception("Simulated failure for generating metadata.")
-
-            if fails_bdist_wheel and "bdist_wheel" in sys.argv:
-                raise Exception("Simulated failure for building a wheel.")
+            if fails_build:
+                raise Exception("Simulated build failure.")
 
             setup(name={name!r}, version={version!r},
                 install_requires={depends!r})
@@ -1243,8 +1238,7 @@ def create_basic_sdist_for_package(
             version=version,
             depends=depends or [],
             setup_py_prelude=setup_py_prelude,
-            fails_bdist_wheel=fails_bdist_wheel,
-            fails_egg_info=fails_egg_info,
+            fails_build=fails_build,
         ),
     }