diff --git a/Cargo.lock b/Cargo.lock index cde82a93d..8834cf047 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -600,13 +600,12 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.17" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd389a4b2970a01282ee455294913c0a43724daedcd1a24c3eb0ec1c1320b66" +checksum = "bcbb6924530aa9e0432442af08bbcafdad182db80d2e560da42a6d442535bf85" dependencies = [ "anstyle", "bstr", - "doc-comment", "libc", "predicates 3.1.3", "predicates-core", @@ -1806,12 +1805,6 @@ dependencies = [ "syn 2.0.99", ] -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "downcast" version = "0.11.0" diff --git a/clients/cli/Cargo.toml b/clients/cli/Cargo.toml index 3e7a15eff..b03cb03b6 100644 --- a/clients/cli/Cargo.toml +++ b/clients/cli/Cargo.toml @@ -50,7 +50,7 @@ tokio = "1.48" solana-nonce = "3.0.0" solana-sdk-ids = "3.0.0" solana-test-validator = "3.0.0" -assert_cmd = "2.0.17" +assert_cmd = "2.1.1" libtest-mimic = "0.8" serial_test = "3.2.0" tempfile = "3.23.0" diff --git a/clients/cli/tests/config.rs b/clients/cli/tests/config.rs index 78c765abe..c16a47648 100644 --- a/clients/cli/tests/config.rs +++ b/clients/cli/tests/config.rs @@ -1,10 +1,15 @@ -use assert_cmd::cmd::Command; +use assert_cmd::cargo::cargo_bin_cmd; #[test] fn invalid_config_will_cause_commands_to_fail() { - let mut cmd = Command::cargo_bin("spl-token").unwrap(); - cmd.args(["address", "--config", "~/nonexistent/config.yml"]); - cmd.assert() - .stderr("error: Could not find config file `~/nonexistent/config.yml`\n"); - cmd.assert().code(1).failure(); + let output = cargo_bin_cmd!("spl-token") + .args(["address", "--config", "~/nonexistent/config.yml"]) + .output() + .unwrap(); + assert_eq!( + std::str::from_utf8(&output.stderr).unwrap(), + "error: Could not find config file `~/nonexistent/config.yml`\n" + ); + assert_eq!(output.status.code().unwrap(), 1); + assert!(!output.status.success()); }