commit 128cffbbf0e0cd0eff63ecab1abaf090333e9d93
author Thomas Vachuska <tom@onlab.us> Mon Oct 24 13:04:46 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Oct 24 20:08:08 2016 +0000
tree 23e14fc629919730eedbc754004db9732aa33f72
parent df95f9ff0824456884a704cf4495547ba11aabce

Adding ability to sanction certain errors in third-party code when checking logs for errors.

Change-Id: Ib35973eb37eb52d814bac8d2dfb1be4e5955e722

tools/test/bin/onos-check-logs

diff --git a/tools/test/bin/onos-check-logs b/tools/test/bin/onos-check-logs
index 257142a..8369cb9 100755
--- a/tools/test/bin/onos-check-logs
+++ b/tools/test/bin/onos-check-logs
@@ -38,35 +38,49 @@
     ssh $remote "
         [ "'`uname`'" != "'"Linux"'" ] && alias tac='tail -r'
         tac $LOG | tr -d '\000' | awk '
-            BEGIN { off = 0; fail = 0; }
+            BEGIN { off = 0; fail = 0; exclusion = 0; trace = \"\";}
             / org.apache.karaf.main.lock.SimpleFileLock lock/ {
                 exit fail;
             }
 
             / ERROR / {
-                print \$0;
-                exc = 0;
-                fail = 1;
+                if (exception && !exclusion) {
+                    print \$0;
+                    exception = 0;
+                    fail = 1;
+                }
+                exclusion = 0;
             }
             / WARN / {
-                if (exc) {
+                if (exception && !exclusion) {
                     print \$0;
-                    exc = 0;
+                    exception = 0;
                 }
+                exclusion = 0;
             }
             / INFO / {
-                exc = 0;
+                exception = 0;
+                exclusion = 0;
             }
 
             /^[a-zA-Z0-9.]*(Exception|Error)/ {
-                print \$0;
-                exc = 1;
-                fail = 1;
+                if (!exclusion) {
+                    print trace;
+                    print \$0;
+                    exception = 1;
+                    fail = 1;
+                    trace = \"\";
+                }
             }
 
             /(	at|Caused by:) / {
-                print \$0;
+                trace = trace \"\n\" \$0;
             }
+
+            # Sanctioned exclusions for exceptions in third-party code; one pattern per exclusion
+            /at org\.apache\.felix\.scr\.impl\.ComponentRegistry\.getComponents\(ComponentRegistry\.java:199\)/ { exclusion = 1; }
+            /at org\.apache\.karaf\.service\.guard\.impl\.GuardProxyCatalog.1.run\(GuardProxyCatalog\.java:253\)/ { exclusion = 1; }
+
         END { exit fail; }
         ' > $aux
         status=\$?