From 158cd6da42eebc440849d976da444176b0437fbf Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Sat, 15 Jan 2022 11:31:13 +0100 Subject: [PATCH] smoke - log code download (#140769) * smoke - log progress/errors of vscode download //cc @connor4312 * reduce spam --- test/smoke/package.json | 4 ++-- test/smoke/src/main.ts | 15 ++++++++++++-- test/smoke/yarn.lock | 44 ++++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/test/smoke/package.json b/test/smoke/package.json index 1ee897451dd..9f5c7a6f953 100644 --- a/test/smoke/package.json +++ b/test/smoke/package.json @@ -11,11 +11,11 @@ "mocha": "node ../node_modules/mocha/bin/mocha" }, "dependencies": { + "@vscode/test-electron": "^2.1.0", "mkdirp": "^1.0.4", "ncp": "^2.0.0", "node-fetch": "^2.6.1", - "rimraf": "3.0.2", - "vscode-test": "^1.6.1" + "rimraf": "3.0.2" }, "devDependencies": { "@types/mkdirp": "^1.0.1", diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts index c958c286db4..b81dec7a1f0 100644 --- a/test/smoke/src/main.ts +++ b/test/smoke/src/main.ts @@ -11,7 +11,7 @@ import * as os from 'os'; import * as minimist from 'minimist'; import * as rimraf from 'rimraf'; import * as mkdirp from 'mkdirp'; -import * as vscodetest from 'vscode-test'; +import * as vscodetest from '@vscode/test-electron'; import fetch from 'node-fetch'; import { Quality, MultiLogger, Logger, ConsoleLogger, FileLogger, measureAndLog } from '../../automation'; import { timeout } from './utils'; @@ -275,9 +275,20 @@ async function ensureStableCode(): Promise { logger.log(`Found VS Code v${version}, downloading previous VS Code version ${previousVersion.version}...`); + let lastProgressMessage: string | undefined = undefined; const stableCodeExecutable = await measureAndLog(vscodetest.download({ cachePath: path.join(os.tmpdir(), 'vscode-test'), - version: previousVersion.version + version: previousVersion.version, + reporter: { + report: report => { + const progressMessage = `download stable code progress: ${report.stage}`; + if (progressMessage !== lastProgressMessage) { + lastProgressMessage = progressMessage; + logger.log(progressMessage); + } + }, + error: error => logger.log(`download stable code error: ${error}`) + } }), 'download stable code', logger); if (process.platform === 'darwin') { diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock index 12230569960..bd0456f70de 100644 --- a/test/smoke/yarn.lock +++ b/test/smoke/yarn.lock @@ -71,6 +71,16 @@ "@types/glob" "*" "@types/node" "*" +"@vscode/test-electron@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.1.0.tgz#3e787e3ffb354051294529f451e6f0f6529ff8eb" + integrity sha512-nE5ha/V+l4WnS0QS5wJhb2S75Ceamif30UOcURHYw+8FoJJHg2g1xM8/dSpvX2Xk4+04Rbl76/ui/tgI5qia+Q== + dependencies: + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + rimraf "^3.0.2" + unzipper "^0.10.11" + agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -96,9 +106,9 @@ balanced-match@^1.0.0: integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= big-integer@^1.6.17: - version "1.6.48" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" - integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== + version "1.6.51" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" + integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== binary@~0.3.0: version "0.3.0" @@ -180,9 +190,9 @@ concat-map@0.0.1: integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== cross-spawn@^6.0.5: version "6.0.5" @@ -196,9 +206,9 @@ cross-spawn@^6.0.5: which "^1.2.9" debug@4: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== dependencies: ms "2.1.2" @@ -323,9 +333,9 @@ graceful-fs@^4.1.2: integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== graceful-fs@^4.2.2: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== has-flag@^3.0.0: version "3.0.0" @@ -798,16 +808,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -vscode-test@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/vscode-test/-/vscode-test-1.6.1.tgz#44254c67036de92b00fdd72f6ace5f1854e1a563" - integrity sha512-086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA== - dependencies: - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - rimraf "^3.0.2" - unzipper "^0.10.11" - watch@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c"