Skip to content

Commit f4d381f

Browse files
authored
Fix deprecated calls to Command::cargo_bin (#409)
Signed-off-by: Sergio Arroutbi <sarroutb@redhat.com>
1 parent 06d9777 commit f4d381f

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

tests/koji-retriever-test.rs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,25 @@ use assert_cmd::prelude::*; // Add methods on commands
2424
use predicates::prelude::*; // Used for writing assertions
2525
use std::process::Command; // Run programs
2626

27-
const KOJI_RETRIEVER_BINARY: &str = "koji-retriever";
2827
const LS_CMD: &str = "/usr/bin/ls";
2928
const RM_CMD: &str = "/usr/bin/rm";
3029

3130
#[test]
3231
fn url_existing_file_does_not_exist_in_test_mode_test() -> Result<(), Box<dyn std::error::Error>> {
3332
// Clean previous downloads (if any)
34-
let mut rm_cmd = Command::cargo_bin(RM_CMD)?;
33+
let mut rm_cmd = Command::new(RM_CMD);
3534
rm_cmd
3635
.arg("-v")
3736
.arg("-f")
3837
.arg("/tmp/pykickstart-3.47-1.fc38.src.rpm");
39-
let mut cmd = Command::cargo_bin(KOJI_RETRIEVER_BINARY)?;
38+
let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("koji-retriever"));
4039
cmd.arg("-u")
4140
.arg("https://koji.fedoraproject.org/koji/buildinfo?buildID=2171737")
4241
.arg("-d")
4342
.arg("/tmp")
4443
.arg("-t");
4544
cmd.assert().success();
46-
let mut cmd_ls = Command::cargo_bin(LS_CMD)?;
45+
let mut cmd_ls = Command::new(LS_CMD);
4746
cmd_ls.arg("/tmp/pykickstart-3.47-1.fc38.src.rpm");
4847
cmd_ls
4948
.assert()
@@ -54,7 +53,7 @@ fn url_existing_file_does_not_exist_in_test_mode_test() -> Result<(), Box<dyn st
5453

5554
#[test]
5655
fn url_existing_test() -> Result<(), Box<dyn std::error::Error>> {
57-
let mut cmd = Command::cargo_bin(KOJI_RETRIEVER_BINARY)?;
56+
let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("koji-retriever"));
5857
cmd.arg("-u")
5958
.arg("https://koji.fedoraproject.org/koji/buildinfo?buildID=2249970")
6059
.arg("-d")
@@ -67,15 +66,15 @@ fn url_existing_test() -> Result<(), Box<dyn std::error::Error>> {
6766

6867
#[test]
6968
fn url_does_not_exist_test() -> Result<(), Box<dyn std::error::Error>> {
70-
let mut cmd = Command::cargo_bin(KOJI_RETRIEVER_BINARY)?;
69+
let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("koji-retriever"));
7170
cmd.arg("-u").arg("https://unexisting-url.almost.sure");
7271
cmd.assert().failure();
7372
Ok(())
7473
}
7574

7675
#[test]
7776
fn url_existing_verbose_test() -> Result<(), Box<dyn std::error::Error>> {
78-
let mut cmd = Command::cargo_bin(KOJI_RETRIEVER_BINARY)?;
77+
let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("koji-retriever"));
7978
cmd.arg("-u")
8079
.arg("https://koji.fedoraproject.org/koji/buildinfo?buildID=2249970")
8180
.arg("-v")
@@ -94,7 +93,7 @@ fn url_existing_verbose_test() -> Result<(), Box<dyn std::error::Error>> {
9493

9594
#[test]
9695
fn url_existing_test_mode_verbose_test() -> Result<(), Box<dyn std::error::Error>> {
97-
let mut cmd = Command::cargo_bin(KOJI_RETRIEVER_BINARY)?;
96+
let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("koji-retriever"));
9897
cmd.arg("-u")
9998
.arg("https://koji.fedoraproject.org/koji/buildinfo?buildID=2249970")
10099
.arg("-v")
@@ -117,7 +116,7 @@ fn url_existing_test_mode_verbose_test() -> Result<(), Box<dyn std::error::Error
117116

118117
#[test]
119118
fn url_existing_slash_end_directory_test() -> Result<(), Box<dyn std::error::Error>> {
120-
let mut cmd = Command::cargo_bin(KOJI_RETRIEVER_BINARY)?;
119+
let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("koji-retriever"));
121120
cmd.arg("-u")
122121
.arg("https://koji.fedoraproject.org/koji/buildinfo?buildID=2249970")
123122
.arg("-v")
@@ -131,7 +130,7 @@ fn url_existing_slash_end_directory_test() -> Result<(), Box<dyn std::error::Err
131130

132131
#[test]
133132
fn url_existing_files_exist_test() -> Result<(), Box<dyn std::error::Error>> {
134-
let mut cmd = Command::cargo_bin(KOJI_RETRIEVER_BINARY)?;
133+
let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("koji-retriever"));
135134
cmd.arg("-u")
136135
.arg("https://koji.fedoraproject.org/koji/buildinfo?buildID=2249970")
137136
.arg("-d")
@@ -140,17 +139,17 @@ fn url_existing_files_exist_test() -> Result<(), Box<dyn std::error::Error>> {
140139
cmd.assert().success().stdout(predicate::str::contains(
141140
"/tmp/pykickstart-3.48-3.fc39.src.rpm",
142141
));
143-
let mut cmd_ls = Command::cargo_bin(LS_CMD)?;
142+
let mut cmd_ls = Command::new(LS_CMD);
144143
cmd_ls.arg("/tmp/pykickstart-3.48-3.fc39.src.rpm");
145144
cmd.assert().success().stdout(predicate::str::contains(
146145
"/tmp/pykickstart-3.48-3.fc39.src.rpm",
147146
));
148-
cmd_ls = Command::cargo_bin(LS_CMD)?;
147+
cmd_ls = Command::new(LS_CMD);
149148
cmd_ls.arg("/tmp/pykickstart-3.48-3.fc39.noarch.rpm");
150149
cmd.assert().success().stdout(predicate::str::contains(
151150
"/tmp/pykickstart-3.48-3.fc39.noarch.rpm",
152151
));
153-
cmd_ls = Command::cargo_bin(LS_CMD)?;
152+
cmd_ls = Command::new(LS_CMD);
154153
cmd_ls.arg("/tmp/python3-kickstart-3.48-3.fc39.noarch.rpm");
155154
cmd.assert().success().stdout(predicate::str::contains(
156155
"/tmp/python3-kickstart-3.48-3.fc39.noarch.rpm",

0 commit comments

Comments
 (0)