canonical-ubuntu-qa team mailing list archive

[Paride Legovini <mp+468805@xxxxxxxxxxxxxxxxxx>]

Paride Legovini has proposed merging ~paride/autopkgtest-cloud:logs-viewer-support-nested into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~paride/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/468805
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~paride/autopkgtest-cloud:logs-viewer-support-nested into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/static/logs-viewer.user.js b/charms/focal/autopkgtest-web/webcontrol/static/logs-viewer.user.js
index 3275950..e5333b8 100644
--- a/charms/focal/autopkgtest-web/webcontrol/static/logs-viewer.user.js
+++ b/charms/focal/autopkgtest-web/webcontrol/static/logs-viewer.user.js
@@ -212,18 +212,18 @@ body {
 
         for (const line in linedLog) {
             switch (true) {
-                case /autopkgtest.*: starting date/.test(linedLog[line]):
+                case /^ *[0-9]+s autopkgtest.*: starting date/.test(linedLog[line]):
                     s = createSection("start run");
                     break;
-                case /autopkgtest.*: @@@@@@@@@@@@@@@@@@@@ test bed setup/.test(linedLog[line]):
+                case /^ *[0-9]+s autopkgtest.*: @@@@@@@@@@@@@@@@@@@@ test bed setup/.test(linedLog[line]):
                     s = createSection("test bed setup");
                     toggleLogSection(s); // fold section by default
                     break;
-                case /autopkgtest.*: @@@@@@@@@@@@@@@@@@@@ apt-source/.test(linedLog[line]):
+                case /^ *[0-9]+s autopkgtest.*: @@@@@@@@@@@@@@@@@@@@ apt-source/.test(linedLog[line]):
                     s = createSection("apt-source");
                     toggleLogSection(s); // fold section by default
                     break;
-                case /autopkgtest.*: test .*/.test(linedLog[line]):
+                case /^ *[0-9]+s autopkgtest.*: test .*/.test(linedLog[line]):
                     var group = linedLog[line].match(/autopkgtest \[.*\]: test (.*): (.*)/)
                     if (group[2].startsWith("preparing testbed")) {
                         s = createSection("test '" + group[1] + "': preparing testbed");
@@ -235,7 +235,7 @@ body {
                         s = createSection("test '" + group[1] + "': test results");
                     }
                     break;
-                case /autopkgtest.*: @@@@@@@@@@@@@@@@@@@@ summary/.test(linedLog[line]):
+                case /^ *[0-9]+s autopkgtest.*: @@@@@@@@@@@@@@@@@@@@ summary/.test(linedLog[line]):
                     s = createSection("summary");
                     break;
                 default: