From fc0cf03ca1a59dab17ec1dbecd7b0cdcfd0dcbeb Mon Sep 17 00:00:00 2001
From: Joining7943 <111500881+Joining7943@users.noreply.github.com>
Date: Sat, 3 Dec 2022 11:57:58 +0100
Subject: [PATCH] tests/tail: Adjust tests for warnings of tail to use
 stderr_to_stdout

---
 tests/by-util/test_tail.rs | 47 +++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/tests/by-util/test_tail.rs b/tests/by-util/test_tail.rs
index c253e58b18e..32a5b0a8c08 100644
--- a/tests/by-util/test_tail.rs
+++ b/tests/by-util/test_tail.rs
@@ -3921,23 +3921,31 @@ fn test_args_when_settings_check_warnings_then_shows_warnings() {
     let scene = TestScenario::new(util_name!());
     let fixtures = &scene.fixtures;
 
-    // TODO: mix stdout and stderr
-    let expected_stdout = "file data\n";
-    fixtures.write("data", expected_stdout);
+    let file_data = "file data\n";
+    fixtures.write("data", file_data);
 
-    let expected_stderr = "tail: warning: --retry ignored; --retry is useful only when following";
+    let expected_stdout = format!(
+        "tail: warning: --retry ignored; --retry is useful only when following\n\
+        {}",
+        file_data
+    );
     scene
         .ucmd()
         .args(&["--retry", "data"])
+        .stderr_to_stdout()
         .run()
-        .stderr_is(expected_stderr)
-        .stdout_is(expected_stdout)
+        .stdout_only(expected_stdout)
         .success();
 
-    let expected_stderr = "tail: warning: --retry only effective for the initial open\n";
+    let expected_stdout = format!(
+        "tail: warning: --retry only effective for the initial open\n\
+        {}",
+        file_data
+    );
     let mut child = scene
         .ucmd()
         .args(&["--follow=descriptor", "--retry", "data"])
+        .stderr_to_stdout()
         .run_no_wait();
 
     child
@@ -3945,26 +3953,33 @@ fn test_args_when_settings_check_warnings_then_shows_warnings() {
         .kill()
         .make_assertion()
         .with_current_output()
-        .stderr_is(expected_stderr)
-        .stdout_is(expected_stdout);
+        .stdout_only(expected_stdout);
 
-    let expected_stderr = "tail: warning: PID ignored; --pid=PID is useful only when following";
+    let expected_stdout = format!(
+        "tail: warning: PID ignored; --pid=PID is useful only when following\n\
+        {}",
+        file_data
+    );
     scene
         .ucmd()
         .args(&["--pid=1000", "data"])
+        .stderr_to_stdout()
         .run()
-        .stderr_is(expected_stderr)
-        .stdout_is(expected_stdout)
+        .stdout_only(expected_stdout)
         .success();
 
-    let expected_stderr = "tail: warning: --retry ignored; --retry is useful only when following\n\
-                                tail: warning: PID ignored; --pid=PID is useful only when following";
+    let expected_stdout = format!(
+        "tail: warning: --retry ignored; --retry is useful only when following\n\
+        tail: warning: PID ignored; --pid=PID is useful only when following\n\
+        {}",
+        file_data
+    );
     scene
         .ucmd()
         .args(&["--pid=1000", "--retry", "data"])
+        .stderr_to_stdout()
         .run()
-        .stderr_is(expected_stderr)
-        .stdout_is(expected_stdout)
+        .stdout_only(expected_stdout)
         .success();
 }