Skip to content

test: Use cargo_bin macro for binary discovery in tests #3107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
szokeasaurusrex wants to merge 1 commit into
base: master
Choose a base branch
from
Open

test: Use cargo_bin macro for binary discovery in tests #3107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tests/integration/test_utils/test_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::ffi::OsStr;
use std::fmt::Display;

use assert_cmd::cargo::cargo_bin;
use assert_cmd::Command;
use mockito::{Mock, Server, ServerGuard};
use thiserror::Error;
Expand Down Expand Up @@ -163,6 +164,7 @@ impl TrycmdTestManager {

fn new(manager: TestManager, path: impl Display) -> Self {
let test_case = TestCases::new();
test_case.register_bin("sentry-cli", cargo_bin!("sentry-cli"));

env::set(manager.server_info(), |k, v| {
test_case.env(k, v);
Expand Down Expand Up @@ -228,7 +230,7 @@ impl AssertCmdTestManager {
I: IntoIterator<Item = S>,
S: AsRef<OsStr>,
{
let mut command = Command::cargo_bin("sentry-cli").expect("sentry-cli should be available");
let mut command = Command::new(cargo_bin!("sentry-cli"));
command.args(args);

env::set(manager.server_info(), |k, v| {
Expand Down