← Back to team overview

canonical-ubuntu-qa team mailing list archive

[Merge] ~hyask/autopkgtest-cloud:skia/log_viewer into autopkgtest-cloud:master

 

Skia has proposed merging ~hyask/autopkgtest-cloud:skia/log_viewer into autopkgtest-cloud:master.

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

For more details, see:
https://code.launchpad.net/~hyask/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/467805

Just a bunch of improvements to the log viewer.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~hyask/autopkgtest-cloud:skia/log_viewer 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 9867d07..3275950 100644
--- a/charms/focal/autopkgtest-web/webcontrol/static/logs-viewer.user.js
+++ b/charms/focal/autopkgtest-web/webcontrol/static/logs-viewer.user.js
@@ -1,12 +1,13 @@
 // ==UserScript==
 // @name         Autopkgtest Logs Enhancer
 // @namespace    http://tampermonkey.net/
-// @version      2024-04-22
+// @version      2024-06-19
 // @description  Does some processing to beautify the tests logs on https://autopkgtest.ubuntu.com
 // @author       Corentin -Cajuteq- Jacquet, Point Vermeil, https://pointvermeil.fr/
+// @author       Florent 'Skia' Jacquet <florent.jacquet@xxxxxxxxxxxxx>
 // @match        objectstorage.prodstack5.canonical.com/*
 // @match        autopkgtest.ubuntu.com/*
-// @icon         https://www.google.com/s2/favicons?sz=64&domain=mozilla.org
+// @icon         data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAe1BMVEXpVCD////99PLqXDDpVSPpVyb//fz++vnpWCn+9/b41M7ra0vvl4Xyqp398u/pWiz2yMDuj3zxpJXyrqL64t376eX53NbrcVPqZD70ua7xp5nwno3tgWr1wLf86ufzs6jsdlrqXzb30Mjvk4DqZkL2xb3th3LseV/sdFe/EwyjAAABzUlEQVRIie1UyXaDMAyUMdhgdsIaQghJQ/v/X1gbYxqCSPtee6xOIM9Yo8UC+Ldfm+06P4E5fpqFrQ30kEdFUn136ak7c0JID3VJlFnjS/womIbVkBBtUb0Ppx2fUQJ880mOu3hfiyDsXGYQGDxJdvHFdF4cLqo23xOGfBIfxvq3WiQdcLx9n65/XxxXk7QPLka4FB4huf+gcIpIvACqxMYYTh2Iy6Oj7s5eJE4QC5Yiiga6vcYdZEK11Caez5xjznmeoZFbqYs/DYiju8o6jEEjeRSufdlcEBZgIZKp8yv9pSl5iRHUdcUqNvUMwYoRwkk1Y3VALUOIMIIvB9iiK9ciSSB4qLaEgM1JIw0CSFXo9XTYzcRgPYaHgzzKnwpu30QUCfR+AIGPuIuOpDRf1XDbICem1fENIzSq3MPGXZ0tRu5rnf5Yyben3sl9g9cDwNoHx1hywvIbxCXxPhBCpbrn3Zb/VLeft/DOGzS5TJWWh/NypMXXWuopSrA7PX/jVPJ0WRr7a8m963bnfTpAuBC6XQI4jVktzfJE1PcLS2flV/gwXPZ6GdOwmDM1u3jz/jeZpF1u8R4GoWuAdn8T503CnOBaihZ7Uf/21/YJkRUUt/HLfJYAAAAASUVORK5CYII=
 // @grant        GM_addStyle
 // ==/UserScript==
 
@@ -222,10 +223,17 @@ body {
                     s = createSection("apt-source");
                     toggleLogSection(s); // fold section by default
                     break;
-                case /autopkgtest.*: test(.*)testbed/.test(linedLog[line]):
-                    var group = linedLog[line].match(/autopkgtest.*: test(.*)testbed/)
-                    s = createSection(" test " + group[1] + " preparing testbed");
-                    toggleLogSection(s); // fold section by default
+                case /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");
+                        toggleLogSection(s); // fold section by default
+                    } else if (group[2].startsWith("[---")) {
+                        s = createSection("test '" + group[1] + "': test run");
+                        toggleLogSection(s); // fold section by default
+                    } else if (group[2].startsWith(" - - - - - - - - - - results - -")) {
+                        s = createSection("test '" + group[1] + "': test results");
+                    }
                     break;
                 case /autopkgtest.*: @@@@@@@@@@@@@@@@@@@@ summary/.test(linedLog[line]):
                     s = createSection("summary");