Merge branch 'main' into redirects-fix

GoogleChrome · Feb 28, 2023 · b91c8a5 · b91c8a5
2 parents a25d86e + c8600d5
commit b91c8a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cli/test/smokehouse/config/exclusions.js b/cli/test/smokehouse/config/exclusions.js
@@ -25,6 +25,8 @@ const exclusions = {
     'metrics-tricky-tti', 'metrics-tricky-tti-late-fcp', 'screenshot',
     // Disabled because of differences that need further investigation
     'byte-efficiency', 'byte-gzip', 'perf-preload',
+    // https://bugs.chromium.org/p/chromium/issues/detail?id=1420418
+    'issues-mixed-content',
   ],
 };
 

diff --git a/core/scripts/pptr-run-devtools.js b/core/scripts/pptr-run-devtools.js
@@ -172,14 +172,14 @@ async function waitForLighthouseReady() {
   }
   // @ts-expect-error global
   const targetManager = SDK.targetManager || (SDK.TargetManager.TargetManager || SDK.TargetManager).instance();
-  if (targetManager.mainTarget() === null) {
+  if (targetManager.primaryPageTarget() === null) {
     if (targetManager?.observeTargets) {
       await new Promise(resolve => targetManager.observeTargets({
         targetAdded: resolve,
         targetRemoved: () => {},
       }));
     } else {
-      while (targetManager.mainTarget() === null) {
+      while (targetManager.primaryPageTarget() === null) {
         await new Promise(resolve => setTimeout(resolve, 100));
       }
     }