lighthouse 9.5.0-dev.20220705 → 9.5.0-dev.20220706

package/lighthouse-cli/test/smokehouse/lighthouse-runners/devtools.js

@@ -21,10 +21,10 @@ const devtoolsDir =
  * @param {string[]} logs
  * @param {string} command
  * @param {string[]} args
+ * @return {Promise<boolean>} true if command exited successfully.
  */
-async function spawnAndLog(logs, command, args) {
-  /** @type {Promise<void>} */
-  const promise = new Promise((resolve) => {
+function spawnAndLog(logs, command, args) {
+  return new Promise((resolve) => {
     const spawnHandle = spawn(command, args);
     spawnHandle.on('close', code => {
       if (code) {
@@ -32,7 +32,7 @@ async function spawnAndLog(logs, command, args) {
       } else {
         logs.push('[SUCCESS] Command exited with code: 0\n');
       }
-      resolve();
+      resolve(code === 0);
     });
     spawnHandle.on('error', (error) => {
       logs.push(`ERROR: ${error.toString()}`);
@@ -48,21 +48,22 @@ async function spawnAndLog(logs, command, args) {
       logs.push(`STDERR: ${data}`);
     });
   });
-  await promise;
 }
 
-/** @type {Promise<void>} */
+/** @type {Promise<boolean>} */
 let buildDevtoolsPromise;
 /**
- * @param {string[]} logs
  * Download/pull latest DevTools, build Lighthouse for DevTools, roll to DevTools, and build DevTools.
+ * @param {string[]} logs
  */
 async function buildDevtools(logs) {
-  if (process.env.CI) return;
+  if (process.env.CI) return true;
 
   process.env.DEVTOOLS_PATH = devtoolsDir;
-  await spawnAndLog(logs, 'bash', ['lighthouse-core/test/chromium-web-tests/download-devtools.sh']);
-  await spawnAndLog(logs, 'bash', ['lighthouse-core/test/chromium-web-tests/roll-devtools.sh']);
+  const success =
+    await spawnAndLog(logs, 'bash', ['lighthouse-core/test/devtools-tests/download-devtools.sh']) &&
+    await spawnAndLog(logs, 'bash', ['lighthouse-core/test/devtools-tests/roll-devtools.sh']);
+  return success;
 }
 
 /**
@@ -80,7 +81,10 @@ async function runLighthouse(url, configJson, testRunnerOptions = {}) {
   const logs = [];
 
   if (!buildDevtoolsPromise) buildDevtoolsPromise = buildDevtools(logs);
-  await buildDevtoolsPromise;
+  if (!await buildDevtoolsPromise) {
+    const log = logs.join('') + '\n';
+    throw new Error(`failed to build devtools:\n${log}`);
+  }
 
   const outputDir = fs.mkdtempSync(os.tmpdir() + '/lh-smoke-cdt-runner-');
   const chromeFlags = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "9.5.0-dev.20220705",
+  "version": "9.5.0-dev.20220706",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {
@@ -76,8 +76,7 @@
     "update:sample-artifacts": "node lighthouse-core/scripts/update-report-fixtures.js",
     "update:sample-json": "yarn i18n:collect-strings && node ./lighthouse-cli -A=./lighthouse-core/test/results/artifacts --config-path=./lighthouse-core/test/results/sample-config.js --output=json --output-path=./lighthouse-core/test/results/sample_v2.json && node lighthouse-core/scripts/cleanup-LHR-for-diff.js ./lighthouse-core/test/results/sample_v2.json --only-remove-timing && node ./lighthouse-core/scripts/update-flow-fixtures.js",
     "update:flow-sample-json": "yarn i18n:collect-strings && node ./lighthouse-core/scripts/update-flow-fixtures.js",
-    "update:test-devtools": "bash lighthouse-core/test/chromium-web-tests/test-locally.sh --reset-results",
-    "test-devtools": "bash lighthouse-core/test/chromium-web-tests/test-locally.sh",
+    "test-devtools": "bash lighthouse-core/test/devtools-tests/test-locally.sh",
     "open-devtools": "bash lighthouse-core/scripts/open-devtools.sh",
     "run-devtools": "node lighthouse-core/scripts/pptr-run-devtools.js",
     "diff:sample-json": "yarn i18n:checks && bash lighthouse-core/scripts/assert-golden-lhr-unchanged.sh",

package/tsconfig.json

@@ -39,7 +39,6 @@
     "clients/test/**/*.js",
     "lighthouse-cli/test/fixtures/**/*.js",
     "lighthouse-core/scripts/legacy-javascript/variants",
-    "lighthouse-core/test/chromium-web-tests/webtests",
     // These test files require further changes before they can be type checked.
     "lighthouse-core/test/config/budget-test.js",
     "lighthouse-core/test/config/config-helpers-test.js",

package/third-party/devtools-tests/README.md

@@ -1,14 +0,0 @@
-# Devtools e2e Tests
-
-These tests are rolled into the Chromium DevTools Frontend codebase. They "belong" to the devtools frontend, but are truly defined in this Lighthouse repo.
-
-Run with `sh lighthouse-core/test/devtools-tests/test-locally.sh`.
-
-See `lighthouse-core/test/chromium-web-tests/README.md` for more.
-
-## Sync
-
-```sh
-rsync -ahvz --exclude='OWNERS' ~/src/devtools/devtools-frontend/test/e2e/lighthouse/ third-party/devtools-tests/e2e/lighthouse/
-rsync -ahvz --exclude='OWNERS' ~/src/devtools/devtools-frontend/test/e2e/resources/lighthouse/ third-party/devtools-tests/e2e/resources/lighthouse/
-```

package/third-party/devtools-tests/e2e/lighthouse/BUILD.gn

@@ -1,17 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("../../../third_party/typescript/typescript.gni")
-
-node_ts_library("lighthouse") {
-  sources = [
-    "generate-report_test.ts",
-    "indexeddb-warning_test.ts",
-  ]
-
-  deps = [
-    "../../shared",
-    "../helpers",
-  ]
-}

package/third-party/devtools-tests/e2e/lighthouse/generate-report_test.ts

@@ -1,29 +0,0 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import {assert} from 'chai';
-
-import {goToResource} from '../../shared/helper.js';
-import {describe, it} from '../../shared/mocha-extensions.js';
-import {isGenerateReportButtonDisabled, navigateToLighthouseTab} from '../helpers/lighthouse-helpers.js';
-
-describe('The Lighthouse Tab', function() {
-  this.timeout(20_000);
-
-  it('shows a button to generate a new report', async () => {
-    await navigateToLighthouseTab('empty.html');
-
-    const disabled = await isGenerateReportButtonDisabled();
-    assert.isFalse(disabled, 'The Generate Report button should not be disabled');
-  });
-
-  // Broken on non-debug runs
-  it.skip('[crbug.com/1057948] shows generate report button even when navigating to an unreachable page', async () => {
-    await navigateToLighthouseTab('empty.html');
-
-    await goToResource('network/unreachable.rawresponse');
-    const disabled = await isGenerateReportButtonDisabled();
-    assert.isTrue(disabled, 'The Generate Report button should be disabled');
-  });
-});

package/third-party/devtools-tests/e2e/lighthouse/indexeddb-warning_test.ts

@@ -1,29 +0,0 @@
-// Copyright 2022 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import {assert} from 'chai';
-
-import {waitFor} from '../../shared/helper.js';
-import {describe, it} from '../../shared/mocha-extensions.js';
-import {navigateToLighthouseTab} from '../helpers/lighthouse-helpers.js';
-
-describe('IndexedDB warning', function() {
-  this.timeout(20_000);
-
-  it('displays when important data may affect performance', async () => {
-    await navigateToLighthouseTab('empty.html');
-
-    let warningElem = await waitFor('.lighthouse-warning-text.hidden');
-    const warningText1 = await warningElem.evaluate(node => node.textContent?.trim());
-    assert.strictEqual(warningText1, '');
-
-    await navigateToLighthouseTab('lighthouse/lighthouse-storage.html');
-
-    warningElem = await waitFor('.lighthouse-warning-text:not(.hidden)');
-    const expected =
-        'There may be stored data affecting loading performance in this location: IndexedDB. Audit this page in an incognito window to prevent those resources from affecting your scores.';
-    const warningText2 = await warningElem.evaluate(node => node.textContent?.trim());
-    assert.strictEqual(warningText2, expected);
-  });
-});

package/third-party/devtools-tests/e2e/resources/lighthouse/BUILD.gn

@@ -1,9 +0,0 @@
-# Copyright 2022 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("../../../../scripts/build/ninja/copy.gni")
-
-copy_to_gen("lighthouse") {
-  sources = [ "lighthouse-storage.html" ]
-}

package/third-party/devtools-tests/e2e/resources/lighthouse/lighthouse-storage.html

@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<head>
-  <meta charset="UTF-8">
-  <script>
-    // Indexeddb
-    window.indexedDB.open("DataBase", 3);
-  </script>
-</head>
-<body>
-  hi
-</body>