compare-current-and-expected comment "ERROR: "

Issue #224
jtmoon79 · Nov 6, 2023 · c7ec4eb · c7ec4eb
1 parent e75daad
commit c7ec4eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/tools/compare-current-and-expected/common.sh b/tools/compare-current-and-expected/common.sh
@@ -56,8 +56,11 @@ function stderr_clean () {
     # - remove warnings as they are printed in an unpredictable order
     # - remove `streaming: `, `blocks high:`, `lines high:` from the
     #   "streaming" summary. Explained in Issue #213
+    # - remove `ERROR:` because they are sometimes printed by processing threads
+    #   and so the timing of prints may vary
     # - remove `DateTimeParseInstr` as it varies due to changes in the
     #   `datetime.rs` as `DateTimeParseInstr` includes a line number.
+    # - remove `ERROR:` as it varies. See Issue #224
     if [[ ${#} -ne 1 ]]; then
         echo "ERROR function stderr_clean must be passed one file argument" >&2
         exit 1
@@ -74,6 +77,7 @@ function stderr_clean () {
         -e '/^[ ]+streaming: .*$/d' \
         -e '/^[ ]+blocks high[ ]+: .*$/d' \
         -e '/^[ ]+lines high[ ]+: .*$/d' \
+        -e '/^ERROR: .*$/d' \
         -e '0,/^\+ \..*$/d' \
         -e '/.*DateTimeParseInstr:.*/d' \
         "${1}"

diff --git a/tools/compare-current-and-expected/expected.stderr b/tools/compare-current-and-expected/expected.stderr
@@ -1,10 +1,3 @@
-ERROR: other error: failed to read entire block for file "./logs/other/tests/invalid.tar"
-ERROR: path does not exist "#./logs/other/tests/dtf9c-23-12x2.log.gz  # Issue #189"
-ERROR: unexpected end of file (GzDecoder.read(…)) file "./logs/other/tests/invalid.gz"
-ERROR: sd_journal_open_files("./logs/other/tests/invalid.journal") returned -61; ENODATA
-ERROR: failed to find XZ stream header magic bytes for "./logs/other/tests/invalid.xz"
-ERROR: failed to fill whole buffer (FileXz stream header magic bytes) file "./logs/other/tests/empty.log.xz"
-ERROR: gzip file size 0 is too small for "./logs/other/tests/empty.log.gz"
 
 Files:
 
@@ -15728,9 +15721,9 @@ File: ./logs/Windows10Pro/SysWOW64/Macromed/Flash/FlashInstall32.log
       process: regex captures attempted                            : 238
   Processing Drops:
 
-File: ./logs/other/tests/invalid.tar other error: failed to read entire block for file "./logs/other/tests/invalid.tar"
-File: ./logs/other/tests/invalid.gz MimeGuess(["application/gzip"]) 
 File: #./logs/other/tests/dtf9c-23-12x2.log.gz  # Issue #189 (does not exist)
+File: ./logs/other/tests/invalid.gz MimeGuess(["application/gzip"]) 
+File: ./logs/other/tests/invalid.tar (other error: failed to read entire block for file "./logs/other/tests/invalid.tar")
 
 Program Summary: