Fix CI bootstrap and cargo install fallback

Signed-off-by: Nick Sweeting <git@sweeting.me>

Author: pirate

abxpkg/binprovider_cargo.py

@@ -167,6 +167,17 @@ def default_install_handler(
             cmd=["install", *cargo_install_args, *install_args],
             timeout=timeout,
         )
+        proc_output = format_subprocess_output(proc.stdout, proc.stderr)
+        if (
+            proc.returncode != 0
+            and "--locked" in cargo_install_args
+            and "lock file version 4 requires `-Znext-lockfile-bump`" in proc_output
+        ):
+            proc = self.exec(
+                bin_name=installer_bin,
+                cmd=["install", *cargo_install_args[1:], *install_args],
+                timeout=timeout,
+            )
         if proc.returncode != 0:
             self._raise_proc_error("install", install_args, proc)
         return format_subprocess_output(proc.stdout, proc.stderr)
@@ -202,6 +213,22 @@ def default_update_handler(
             ],
             timeout=timeout,
         )
+        proc_output = format_subprocess_output(proc.stdout, proc.stderr)
+        if (
+            proc.returncode != 0
+            and "--locked" in cargo_install_args
+            and "lock file version 4 requires `-Znext-lockfile-bump`" in proc_output
+        ):
+            proc = self.exec(
+                bin_name=installer_bin,
+                cmd=[
+                    "install",
+                    "--force",
+                    *cargo_install_args[1:],
+                    *install_args,
+                ],
+                timeout=timeout,
+            )
         if proc.returncode != 0:
             self._raise_proc_error("update", install_args, proc)
         return format_subprocess_output(proc.stdout, proc.stderr)

tests/conftest.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import shutil
 import subprocess
 from pathlib import Path
@@ -86,18 +87,27 @@ def _ensure_test_machine_dependencies() -> None:
 class TestMachine:
     def require_tool(self, tool_name: str) -> str:
         tool_path = shutil.which(tool_name)
-        if not tool_path and tool_name == "cargo":
+        if not tool_path:
             proc = subprocess.run(
                 [
                     str(_abxpkg_executable()),
                     "--lib=None",
                     "install",
+                    "--abspath",
                     tool_name,
                 ],
                 capture_output=True,
                 text=True,
+                env={
+                    **os.environ,
+                    "NO_COLOR": "1",
+                    "TERM": "dumb",
+                },
             )
-            tool_path = shutil.which(tool_name)
+            output_lines = [
+                line.strip() for line in proc.stdout.splitlines() if line.strip()
+            ]
+            tool_path = output_lines[-1] if output_lines else shutil.which(tool_name)
             assert proc.returncode == 0 and tool_path, (
                 f"{tool_name} is required on this host for test-machine integration tests, "
                 f"and fallback install via abxpkg failed.\n"

tests/test_cli.py

@@ -1043,7 +1043,7 @@ def test_activate_command_rejects_multiple_shell_modes():
     )
 
     assert result.exit_code != 0
-    assert "choose only one of --bash, --zsh, or --fish" in result.output
+    assert "choose only one of --bash, --zsh, or --fish" in click.unstyle(result.output)
 
 
 def test_exec_command_hidden_alias_runs_like_run():