WIP

MetaMask · Dec 20, 2024 · 4143f7e · 4143f7e
1 parent a02799d
commit 4143f7e
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 86 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1427,7 +1427,7 @@ jobs:
           name: Move test zips to builds
           command: mv ./builds-test ./builds
       - run:
-          name: Run page load benchmark
+          name: Initialize test artifact directories
           command: |
             mkdir -p test-artifacts/chrome/
             cp -R development/charts/flamegraph test-artifacts/chrome/initialisation

diff --git a/test/e2e/mv3-perf-stats/init-load-stats.js b/test/e2e/mv3-perf-stats/init-load-stats.js
@@ -20,52 +20,48 @@ const FixtureBuilder = require('../fixture-builder');
 
 async function profilePageLoad() {
   const parsedLogs = {};
-  try {
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder().build(),
-        disableServerMochaToBackground: true,
-      },
-      async ({ driver }) => {
-        await driver.delay(tinyDelayMs);
-        await driver.navigate();
-        await driver.delay(1000);
-        const logs = await driver.checkBrowserForLavamoatLogs();
+  await withFixtures(
+    {
+      fixtures: new FixtureBuilder().build(),
+      disableServerMochaToBackground: true,
+    },
+    async ({ driver }) => {
+      await driver.delay(tinyDelayMs);
+      await driver.navigate();
+      await driver.delay(1000);
+      const logs = await driver.checkBrowserForLavamoatLogs();
 
-        let logString = '';
-        let logType = '';
+      let logString = '';
+      let logType = '';
 
-        logs.forEach((log) => {
-          if (log.indexOf('"version": 1') >= 0) {
-            // log end here
-            logString += log;
-            parsedLogs[logType] = JSON.parse(`{${logString}}`);
-            logString = '';
-            logType = '';
-          } else if (logType) {
-            // log string continues
-            logString += log;
-          } else if (
-            log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0
-          ) {
-            // background log starts
-            logString += log;
-            logType = 'background';
-          } else if (log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0) {
-            // ui log starts
-            logString += log;
-            logType = 'ui';
-          } else if (log.search(/"name": "Total"/u) >= 0) {
-            // load time log starts
-            logString += log;
-            logType = 'loadTime';
-          }
-        });
-      },
-    );
-  } catch (error) {
-    console.log('Error in trying to parse logs.');
-  }
+      logs.forEach((log) => {
+        if (log.indexOf('"version": 1') >= 0) {
+          // log end here
+          logString += log;
+          parsedLogs[logType] = JSON.parse(`{${logString}}`);
+          logString = '';
+          logType = '';
+        } else if (logType) {
+          // log string continues
+          logString += log;
+        } else if (
+          log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0
+        ) {
+          // background log starts
+          logString += log;
+          logType = 'background';
+        } else if (log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0) {
+          // ui log starts
+          logString += log;
+          logType = 'ui';
+        } else if (log.search(/"name": "Total"/u) >= 0) {
+          // load time log starts
+          logString += log;
+          logType = 'loadTime';
+        }
+      });
+    },
+  );
   return parsedLogs;
 }
 

diff --git a/test/e2e/mv3-stats.js b/test/e2e/mv3-stats.js
@@ -20,49 +20,45 @@ const FixtureBuilder = require('./fixture-builder');
 
 async function profilePageLoad() {
   const parsedLogs = {};
-  try {
-    await withFixtures(
-      { fixtures: new FixtureBuilder().build() },
-      async ({ driver }) => {
-        await driver.delay(tinyDelayMs);
-        await driver.navigate();
-        await driver.delay(1000);
-        const logs = await driver.checkBrowserForLavamoatLogs();
+  await withFixtures(
+    { fixtures: new FixtureBuilder().build() },
+    async ({ driver }) => {
+      await driver.delay(tinyDelayMs);
+      await driver.navigate();
+      await driver.delay(1000);
+      const logs = await driver.checkBrowserForLavamoatLogs();
 
-        let logString = '';
-        let logType = '';
+      let logString = '';
+      let logType = '';
 
-        logs.forEach((log) => {
-          if (log.indexOf('"version": 1') >= 0) {
-            // log end here
-            logString += log;
-            parsedLogs[logType] = JSON.parse(`{${logString}}`);
-            logString = '';
-            logType = '';
-          } else if (logType) {
-            // log string continues
-            logString += log;
-          } else if (
-            log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0
-          ) {
-            // background log starts
-            logString += log;
-            logType = 'background';
-          } else if (log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0) {
-            // ui log starts
-            logString += log;
-            logType = 'ui';
-          } else if (log.search(/"name": "Total"/u) >= 0) {
-            // load time log starts
-            logString += log;
-            logType = 'loadTime';
-          }
-        });
-      },
-    );
-  } catch (error) {
-    console.log('Error in trying to parse logs.');
-  }
+      logs.forEach((log) => {
+        if (log.indexOf('"version": 1') >= 0) {
+          // log end here
+          logString += log;
+          parsedLogs[logType] = JSON.parse(`{${logString}}`);
+          logString = '';
+          logType = '';
+        } else if (logType) {
+          // log string continues
+          logString += log;
+        } else if (
+          log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0
+        ) {
+          // background log starts
+          logString += log;
+          logType = 'background';
+        } else if (log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0) {
+          // ui log starts
+          logString += log;
+          logType = 'ui';
+        } else if (log.search(/"name": "Total"/u) >= 0) {
+          // load time log starts
+          logString += log;
+          logType = 'loadTime';
+        }
+      });
+    },
+  );
   return parsedLogs;
 }