From a3ea519f5bd38bcc515e671d1bb09bc2562d9c28 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 9 Feb 2024 12:48:27 +0000 Subject: [PATCH 1/3] chore: prevent debugger tests from speaking to a backend --- tooling/debugger/tests/debug.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tooling/debugger/tests/debug.rs b/tooling/debugger/tests/debug.rs index 82872ce2739..df5d2f6c35d 100644 --- a/tooling/debugger/tests/debug.rs +++ b/tooling/debugger/tests/debug.rs @@ -14,20 +14,21 @@ mod tests { let nargo_bin = cargo_bin("nargo").into_os_string().into_string().expect("Cannot parse nargo path"); - let mock_backend_path = - path_to_mock_backend().into_string().expect("Cannot parse mock_backend path"); - let mut dbg_session = spawn_bash(Some(10000)).expect("Could not start bash session"); + // Set backend to `/dev/null` to force an error if nargo tries to speak to a backend. dbg_session - .send_line(&format!("export NARGO_BACKEND_PATH={}", mock_backend_path)) + .send_line("export NARGO_BACKEND_PATH=/dev/null") .expect("Could not export NARGO_BACKEND_PATH."); dbg_session.wait_for_prompt().expect("Could not export NARGO_BACKEND_PATH."); // Start debugger and test that it loads for the given program. dbg_session .execute( - &format!("{} debug --program-dir {} --force-brillig", nargo_bin, test_program_dir), + &format!( + "{} debug --program-dir {} --force-brillig --expression-width 3", + nargo_bin, test_program_dir + ), ".*\\Starting debugger.*", ) .expect("Could not start debugger"); From 4ed802a8156ce359e6a96bb8cd64f99a9645f9f9 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 9 Feb 2024 12:51:09 +0000 Subject: [PATCH 2/3] chore: remove test binary loading --- Cargo.lock | 1 - tooling/debugger/Cargo.toml | 1 - tooling/debugger/tests/debug.rs | 2 -- 3 files changed, 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 82a53ec9c31..7731df13278 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2844,7 +2844,6 @@ dependencies = [ "rexpect", "serde_json", "tempfile", - "test-binary", "thiserror", ] diff --git a/tooling/debugger/Cargo.toml b/tooling/debugger/Cargo.toml index 785eacf9463..30d11db8cf3 100644 --- a/tooling/debugger/Cargo.toml +++ b/tooling/debugger/Cargo.toml @@ -27,5 +27,4 @@ serde_json.workspace = true [dev-dependencies] assert_cmd = "2.0.12" rexpect = "0.5.0" -test-binary = "3.0.1" tempfile.workspace = true diff --git a/tooling/debugger/tests/debug.rs b/tooling/debugger/tests/debug.rs index df5d2f6c35d..2990bb8c938 100644 --- a/tooling/debugger/tests/debug.rs +++ b/tooling/debugger/tests/debug.rs @@ -5,8 +5,6 @@ mod tests { use rexpect::spawn_bash; - test_binary::build_test_binary_once!(mock_backend, "../backend_interface/test-binaries"); - // include tests generated by `build.rs` include!(concat!(env!("OUT_DIR"), "/debug.rs")); From a37c43ebf07e8b96803ee8b947f633e489c049c7 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 9 Feb 2024 12:52:50 +0000 Subject: [PATCH 3/3] chore: better formatting --- tooling/debugger/tests/debug.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tooling/debugger/tests/debug.rs b/tooling/debugger/tests/debug.rs index 2990bb8c938..4cb678192b8 100644 --- a/tooling/debugger/tests/debug.rs +++ b/tooling/debugger/tests/debug.rs @@ -24,8 +24,7 @@ mod tests { dbg_session .execute( &format!( - "{} debug --program-dir {} --force-brillig --expression-width 3", - nargo_bin, test_program_dir + "{nargo_bin} debug --program-dir {test_program_dir} --force-brillig --expression-width 3" ), ".*\\Starting debugger.*", )