From d27bdfcb0f44b09a27337e222edabef812607a26 Mon Sep 17 00:00:00 2001 From: Martin Kuntz Jacobsen Date: Mon, 9 Nov 2026 12:28:59 +0100 Subject: [PATCH] cli: fix the four dx_cli_test failures on main (closes #9767) Python and Rust now have family modules, so the no-family-module tests use a shell source and the error-boundary consumer declares both modules. The init doc row test adds a dx_deployment so release.yml is planned. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Xut2hwESun1HL2eSVd1d5B --- cli/cli/src/adopt/init_files.rs | 6 ++++-- cli/cli/src/exec/error_boundary_launcher_tests.rs | 2 +- cli/cli/src/exec/generate.rs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cli/cli/src/adopt/init_files.rs b/cli/cli/src/adopt/init_files.rs index 53ed0b123..e1efd7a06 100644 --- a/cli/cli/src/adopt/init_files.rs +++ b/cli/cli/src/adopt/init_files.rs @@ -802,6 +802,8 @@ mod tests { let scratch = dx_test_scratch::scratch("dx-init-doc-rows-"); let root = scratch.path(); std::fs::write(root.join("app.py"), "print(1)\n").expect("source"); + std::fs::create_dir(root.join("pkg")).expect("pkg"); + std::fs::write(root.join("pkg/BUILD.bazel"), "dx_deployment(name = \"app\")\n").expect("build"); let rows = doc_rows(); let mut files = plan(root, "my_project", true, &Agent::ALL).expect("plan"); let gitlab = @@ -931,13 +933,13 @@ mod tests { } #[test] - fn apply_adds_no_family_module_for_a_python_workspace() { + fn apply_adds_no_family_module_for_a_shell_workspace() { let scratch = dx_test_scratch::scratch("dx-init-family-deps-"); let root = scratch.path(); let module = "module(name = \"app\")\nbazel_dep(name = \"rules_dx\", version = \"0.0.0\")\n"; std::fs::write(root.join("MODULE.bazel"), module).expect("write"); - std::fs::write(root.join("app.py"), "").expect("write"); + std::fs::write(root.join("app.sh"), "").expect("write"); let (code, _out, err) = run(&invocation(&["init", "--apply"]), root); assert_eq!(code, 0, "{err}"); let after = std::fs::read_to_string(root.join("MODULE.bazel")).expect("read"); diff --git a/cli/cli/src/exec/error_boundary_launcher_tests.rs b/cli/cli/src/exec/error_boundary_launcher_tests.rs index 93c78c59b..aaddcd90b 100644 --- a/cli/cli/src/exec/error_boundary_launcher_tests.rs +++ b/cli/cli/src/exec/error_boundary_launcher_tests.rs @@ -9,7 +9,7 @@ use std::sync::Arc; use std::sync::atomic::{AtomicBool, Ordering}; use std::time::{Duration, Instant}; -const MODULE: &str = "module(name = \"acme_renamed\", version = \"1.2.3\")\nbazel_dep(name = \"rules_dx\", version = \"0.0.0\")\n"; +const MODULE: &str = "module(name = \"acme_renamed\", version = \"1.2.3\")\nbazel_dep(name = \"rules_dx\", version = \"0.0.0\")\nbazel_dep(name = \"rules_dx_python\", version = \"0.0.0\")\nbazel_dep(name = \"rules_dx_rust\", version = \"0.0.0\")\n"; const FAKE_BAZEL: &str = r#"#!/bin/sh case " $* " in *" --output_groups=dx_shards "*) exit 1 ;; esac diff --git a/cli/cli/src/exec/generate.rs b/cli/cli/src/exec/generate.rs index fa9708aba..aee846632 100644 --- a/cli/cli/src/exec/generate.rs +++ b/cli/cli/src/exec/generate.rs @@ -843,7 +843,7 @@ mod tests { let module = "module(name = \"app\")\nbazel_dep(name = \"rules_dx\", version = \"1.0.0\")\n"; harness.write_source("MODULE.bazel", module); - harness.write_source("app.py", ""); + harness.write_source("app.sh", ""); harness.intended = Some(intended_witness("default", true, "", "")); let (code, out, err) = harness.run(&["generate", "--apply"]); assert_eq!(code, 0, "{out}{err}");