From 2a16a69db2ce5db8943abd08ec1d73f0dd0c5972 Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@EquinoxOLI.org>
Date: Fri, 17 Jun 2022 02:16:07 -0400
Subject: [PATCH] add exceptions for some expected errors generated by the test
 scripts

---
 qa/test_output_webifier.pl | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/qa/test_output_webifier.pl b/qa/test_output_webifier.pl
index 980a428ac..05e7fee6e 100755
--- a/qa/test_output_webifier.pl
+++ b/qa/test_output_webifier.pl
@@ -114,6 +114,24 @@ sub consider_error_count_inc {
             print STDOUT "error skipped, $error_count\n";
             return;
         }
+        # 34-lp1787968 intentionally causes an error
+        if ($line =~ /spool_jacket: unable to parse \/openils\/var\/web\/opac\/extras\/ac\/jacket\/large\/r\/1.temp/) {
+            print DEBUG "error skipped, $error_count\n";
+            print STDOUT "error skipped, $error_count\n";
+            return;
+        }
+        # lp1883171-copy-inventory.t intentionally causes some errors
+        if ($line =~ /Inventory workstation owning lib/) {
+            print DEBUG "error skipped, $error_count\n";
+            print STDOUT "error skipped, $error_count\n";
+            return;
+        }
+        if ($line =~ /open-ils.cstore.direct.asset.copy_inventory.create/) {
+            print DEBUG "error skipped, $error_count\n";
+            print STDOUT "error skipped, $error_count\n";
+            return;
+        }
+        print "unskipped: $line";
     }
     if ($subpage eq 'Gathering system information') {
         if ($line =~ /Status,Err: uppercase=bad/) {
@@ -281,6 +299,7 @@ sub print_pass_or_fail {
     my $p_subpage_return_value = shift;
     my $expected_error_count = {}; # keyed on subpage, value = # of expected errors
     $expected_error_count{'Installing Evergreen pre-requisites'} = 1; # Result: FAIL for Class-DBI-Frozen-301-3.0.1-Dd3c7H
+    $expected_error_count{'Log Output: osrfsys.log'} = 6; # INSERT errors from copy inventory test
 
     if (! defined $expected_error_count{$p_subpage}) {
         $expected_error_count{$p_subpage} = 0;
@@ -292,7 +311,7 @@ sub print_pass_or_fail {
     #        $p_error_count = 1;
     #    }
     #}
-    #print "subpage = <$p_subpage> error_count = $p_error_count\n";
+    print "subpage = <$p_subpage>: expected error count = " . $expected_error_count{$p_subpage} . ", actual error_count = $p_error_count\n";
     if ($p_error_count && $p_error_count != $expected_error_count{$p_subpage} ) {
         if (!$first_failure) {
             $first_failure = 1;
-- 
2.11.0