summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-03-01 15:01:50 +0100
committerMatthias Beyer <mail@beyermatthias.de>2020-03-01 15:40:08 +0100
commitb23b81658c411508b2d5acaf3db097654f370292 (patch)
tree2acb021124833b3c98e669bcb968838e00e2018b
parent8e04277f6a558766ffe3698c10816c825a5bfd78 (diff)
Update tests for new runtime flags
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--tests/ui/src/imag_category.rs8
-rw-r--r--tests/ui/src/imag_grep.rs3
-rw-r--r--tests/ui/src/imag_header.rs2
-rw-r--r--tests/ui/src/imag_mv.rs3
-rw-r--r--tests/ui/src/imag_tag.rs3
-rw-r--r--tests/ui/src/imag_view.rs3
6 files changed, 15 insertions, 7 deletions
diff --git a/tests/ui/src/imag_category.rs b/tests/ui/src/imag_category.rs
index 0f865c5d..268bc8a2 100644
--- a/tests/ui/src/imag_category.rs
+++ b/tests/ui/src/imag_category.rs
@@ -28,7 +28,8 @@ pub fn binary(tempdir: &TempDir) -> Command {
pub fn call(tmpdir: &TempDir, args: &[&str]) -> Vec<String> {
let mut binary = binary(tmpdir);
binary.stdin(std::process::Stdio::inherit());
- binary.arg("--ignore-ids");
+ binary.arg("--pipe-input");
+ binary.arg("--pipe-output");
binary.args(args);
debug!("Command = {:?}", binary);
crate::imag::stdout_of_command(binary)
@@ -44,7 +45,10 @@ fn test_new_entry_has_no_category() {
let (assert, stderr_output) = {
let mut binary = binary(&imag_home);
binary.stdin(std::process::Stdio::inherit());
- binary.args(&["--ignore-ids", "get", "test"]);
+ binary.arg("--pipe-input");
+ binary.arg("--pipe-output");
+ binary.arg("get");
+ binary.arg("test");
crate::imag::stderr_of_command(&mut binary)
};
diff --git a/tests/ui/src/imag_grep.rs b/tests/ui/src/imag_grep.rs
index 498bf72f..00b0a602 100644
--- a/tests/ui/src/imag_grep.rs
+++ b/tests/ui/src/imag_grep.rs
@@ -24,7 +24,8 @@ use assert_fs::fixture::TempDir;
pub fn call(tempdir: &TempDir, pattern: &str) -> Vec<String> {
let mut binary = binary(tempdir);
- binary.arg("--ignore-ids");
+ binary.arg("--pipe-input");
+ binary.arg("--pipe-output");
binary.arg(pattern);
// ensure that stdin is not used by the child process
diff --git a/tests/ui/src/imag_header.rs b/tests/ui/src/imag_header.rs
index 1ae43bb4..2789c366 100644
--- a/tests/ui/src/imag_header.rs
+++ b/tests/ui/src/imag_header.rs
@@ -56,7 +56,7 @@ fn test_imag_version_as_semver_string() {
crate::imag_init::call(&imag_home);
crate::imag_create::call(&imag_home, &["test"]);
- let output = call(&imag_home, &["--ignore-ids", "test", "read", "imag.version"]);
+ let output = call(&imag_home, &["--pipe-input", "--pipe-output", "test", "read", "imag.version"]);
let version = version::version!();
debug!("output = {:?}", output);
assert_eq!(output.len(), 1);
diff --git a/tests/ui/src/imag_mv.rs b/tests/ui/src/imag_mv.rs
index 3183097b..4155bf71 100644
--- a/tests/ui/src/imag_mv.rs
+++ b/tests/ui/src/imag_mv.rs
@@ -30,7 +30,8 @@ pub fn binary(tempdir: &TempDir) -> Command {
pub fn call(tmpdir: &TempDir, src: &str, dst: &str) {
let mut binary = binary(tmpdir);
binary.stdin(std::process::Stdio::inherit());
- binary.arg("--ignore-ids");
+ binary.arg("--pipe-input");
+ binary.arg("--pipe-output");
binary.arg(src);
binary.arg(dst);
diff --git a/tests/ui/src/imag_tag.rs b/tests/ui/src/imag_tag.rs
index f254db15..2f86496a 100644
--- a/tests/ui/src/imag_tag.rs
+++ b/tests/ui/src/imag_tag.rs
@@ -28,7 +28,8 @@ pub fn binary(tempdir: &TempDir) -> Command {
pub fn call(tmpdir: &TempDir, args: &[&str]) -> Vec<String> {
let mut binary = binary(tmpdir);
binary.stdin(std::process::Stdio::inherit());
- binary.arg("--ignore-ids");
+ binary.arg("--pipe-input");
+ binary.arg("--pipe-output");
binary.args(args);
debug!("Command = {:?}", binary);
crate::imag::stdout_of_command(binary)
diff --git a/tests/ui/src/imag_view.rs b/tests/ui/src/imag_view.rs
index 498a53c3..b749cdc2 100644
--- a/tests/ui/src/imag_view.rs
+++ b/tests/ui/src/imag_view.rs
@@ -28,7 +28,8 @@ pub fn call(tempdir: &TempDir, targets: &[&str]) -> Vec<String> {
// ensure that stdin is not used by the child process
binary.stdin(std::process::Stdio::inherit());
- binary.arg("--ignore-ids");
+ binary.arg("--pipe-input");
+ binary.arg("--pipe-output");
for target in targets.iter() {
binary.arg(target);