From 0fd984558017d6a6741a0238fd533962cc183a07 Mon Sep 17 00:00:00 2001
From: Tim Stack <timothyshanestack@gmail.com>
Date: Thu, 22 Sep 2022 10:54:09 -0700
Subject: [PATCH] [tests] test_tailer tweaks

---
 TESTS_ENVIRONMENT.in                                |  2 +-
 src/tailer/test_tailer.sh                           | 13 +------------
 test/Makefile.am                                    |  2 ++
 ....sh_12f539e535df04364316699f9edeac461aa9f9de.err |  3 +++
 ....sh_12f539e535df04364316699f9edeac461aa9f9de.out |  8 ++++++++
 5 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 test/expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.err
 create mode 100644 test/expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.out

diff --git a/TESTS_ENVIRONMENT.in b/TESTS_ENVIRONMENT.in
index 70fa9e0d..775c59a6 100644
--- a/TESTS_ENVIRONMENT.in
+++ b/TESTS_ENVIRONMENT.in
@@ -123,7 +123,7 @@ run_cap_test() {
            export has_errors="yes"
        fi
     else
-       echo "FAIL! EXPECTED OUT MISSING"
+       echo "FAIL! EXPECTED OUT MISSING -- ${srcdir}/expected/${test_file_base}_${test_hash}.out"
        export has_errors="yes"
     fi
 
diff --git a/src/tailer/test_tailer.sh b/src/tailer/test_tailer.sh
index c8f40ac0..932fe242 100755
--- a/src/tailer/test_tailer.sh
+++ b/src/tailer/test_tailer.sh
@@ -23,18 +23,7 @@ info: load preview request -- 1234
 info: exiting...
 EOF
 
-run_test ./drive_tailer preview "${test_dir}/remote-log-dir/*"
-
-check_output "preview of file failed?" <<EOF
-preview of file: {test_dir}/remote-log-dir/*
-{test_dir}/remote-log-dir/logfile_access_log.0
-{test_dir}/remote-log-dir/logfile_access_log.1
-
-all done!
-tailer stderr:
-info: load preview request -- 1234
-info: exiting...
-EOF
+run_cap_test ./drive_tailer preview "${test_dir}/remote-log-dir/*"
 
 run_test ./drive_tailer possible "${test_dir}/logfile_access_log.*"
 
diff --git a/test/Makefile.am b/test/Makefile.am
index a2f2cd19..bdbc94f6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -223,6 +223,8 @@ include expected/expected.am
 
 dist_noinst_DATA = \
     $(EXPECTED_FILES) \
+    expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.err \
+    expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.out \
 	ansi-colors.0.in \
 	bad-config/formats/invalid-properties/format.json \
 	bad-config/formats/invalid-regex/format.json \
diff --git a/test/expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.err b/test/expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.err
new file mode 100644
index 00000000..b77acd0b
--- /dev/null
+++ b/test/expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.err
@@ -0,0 +1,3 @@
+tailer stderr:
+info: load preview request -- 1234
+info: exiting...
diff --git a/test/expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.out b/test/expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.out
new file mode 100644
index 00000000..cd583059
--- /dev/null
+++ b/test/expected/test_tailer.sh_12f539e535df04364316699f9edeac461aa9f9de.out
@@ -0,0 +1,8 @@
+preview of file: {test_dir}/remote-log-dir/*
+{test_dir}/remote-log-dir/logfile_access_log.0
+{test_dir}/remote-log-dir/logfile_access_log.1
+
+all done!
+tailer stderr:
+info: load preview request -- 1234
+info: exiting...