From aeaf2cebfb3b931a0538ad0f2ec9929180cb2ea8 Mon Sep 17 00:00:00 2001
From: Michael Debertol <michael.debertol@gmail.com>
Date: Wed, 16 Jun 2021 17:16:28 +0200
Subject: [PATCH] tests/tty: fix test inputs

calling `pipe_in("</dev/null")` does not pipe in the `/dev/null` file,
but the raw string "</dev/null".

Closes https://github.com/uutils/coreutils/issues/2301
---
 tests/by-util/test_tty.rs | 46 +++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/tests/by-util/test_tty.rs b/tests/by-util/test_tty.rs
index 6bca54e03..a59be61b4 100644
--- a/tests/by-util/test_tty.rs
+++ b/tests/by-util/test_tty.rs
@@ -1,11 +1,14 @@
+use std::fs::File;
+
 use crate::common::util::*;
 
 #[test]
 #[cfg(not(windows))]
 fn test_dev_null() {
     new_ucmd!()
-        .pipe_in("</dev/null")
+        .set_stdin(File::open("/dev/null").unwrap())
         .fails()
+        .code_is(1)
         .stdout_is("not a tty\n");
 }
 
@@ -14,44 +17,49 @@ fn test_dev_null() {
 fn test_dev_null_silent() {
     new_ucmd!()
         .args(&["-s"])
-        .pipe_in("</dev/null")
+        .set_stdin(File::open("/dev/null").unwrap())
         .fails()
+        .code_is(1)
         .stdout_is("");
 }
 
 #[test]
 fn test_close_stdin() {
-    new_ucmd!().pipe_in("<&-").fails().stdout_is("not a tty\n");
+    let mut child = new_ucmd!().run_no_wait();
+    drop(child.stdin.take());
+    let output = child.wait_with_output().unwrap();
+    assert_eq!(output.status.code(), Some(1));
+    assert_eq!(std::str::from_utf8(&output.stdout), Ok("not a tty\n"));
 }
 
 #[test]
 fn test_close_stdin_silent() {
-    new_ucmd!()
-        .args(&["-s"])
-        .pipe_in("<&-")
-        .fails()
-        .stdout_is("");
+    let mut child = new_ucmd!().arg("-s").run_no_wait();
+    drop(child.stdin.take());
+    let output = child.wait_with_output().unwrap();
+    assert_eq!(output.status.code(), Some(1));
+    assert!(output.stdout.is_empty());
 }
 
 #[test]
 fn test_close_stdin_silent_long() {
-    new_ucmd!()
-        .args(&["--silent"])
-        .pipe_in("<&-")
-        .fails()
-        .stdout_is("");
+    let mut child = new_ucmd!().arg("--silent").run_no_wait();
+    drop(child.stdin.take());
+    let output = child.wait_with_output().unwrap();
+    assert_eq!(output.status.code(), Some(1));
+    assert!(output.stdout.is_empty());
 }
 
 #[test]
 fn test_close_stdin_silent_alias() {
-    new_ucmd!()
-        .args(&["--quiet"])
-        .pipe_in("<&-")
-        .fails()
-        .stdout_is("");
+    let mut child = new_ucmd!().arg("--quiet").run_no_wait();
+    drop(child.stdin.take());
+    let output = child.wait_with_output().unwrap();
+    assert_eq!(output.status.code(), Some(1));
+    assert!(output.stdout.is_empty());
 }
 
 #[test]
 fn test_wrong_argument() {
-    new_ucmd!().args(&["a"]).fails();
+    new_ucmd!().args(&["a"]).fails().code_is(2);
 }