From 81ad1f968d967cb5cc77c1904759b48901ca9a6b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 24 Jan 2022 13:59:56 +0100 Subject: [PATCH] Do not force that a connection token CLI argument is present --- src/vs/server/node/serverConnectionToken.ts | 2 +- src/vs/server/test/node/serverConnectionToken.test.ts | 6 ++++-- test/automation/src/playwrightDriver.ts | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/vs/server/node/serverConnectionToken.ts b/src/vs/server/node/serverConnectionToken.ts index 6d169289a17..2b5b504351b 100644 --- a/src/vs/server/node/serverConnectionToken.ts +++ b/src/vs/server/node/serverConnectionToken.ts @@ -104,5 +104,5 @@ export function parseServerConnectionToken(args: ServerParsedArgs): ServerConnec return new OptionalServerConnectionToken(generateUuid()); } - return new ServerConnectionTokenParseError(`Please use one of the following arguments: '--connection-token', '--connection-token-file' or '--without-connection-token'.`); + return new MandatoryServerConnectionToken(generateUuid()); } diff --git a/src/vs/server/test/node/serverConnectionToken.test.ts b/src/vs/server/test/node/serverConnectionToken.test.ts index cea6d7ac4a5..0678823897a 100644 --- a/src/vs/server/test/node/serverConnectionToken.test.ts +++ b/src/vs/server/test/node/serverConnectionToken.test.ts @@ -21,8 +21,10 @@ suite('parseServerConnectionToken', () => { assert.strictEqual(isError(r), true); } - test('no arguments results in error', () => { - assertIsError(parseServerConnectionToken({} as ServerParsedArgs)); + test('no arguments generates a token that is mandatory', () => { + const result = parseServerConnectionToken({} as ServerParsedArgs); + assert.ok(!(result instanceof ServerConnectionTokenParseError)); + assert.ok(result.type === ServerConnectionTokenType.Mandatory); }); test('no arguments with --compatibility generates a token that is not mandatory', () => { diff --git a/test/automation/src/playwrightDriver.ts b/test/automation/src/playwrightDriver.ts index 6b75ad93fbc..53568cb9c65 100644 --- a/test/automation/src/playwrightDriver.ts +++ b/test/automation/src/playwrightDriver.ts @@ -14,7 +14,6 @@ import * as kill from 'tree-kill'; import { PageFunction } from 'playwright-core/types/structs'; import { Logger, measureAndLog } from './logger'; import type { LaunchOptions } from './code'; -import * as crypto from 'crypto'; const width = 1200; const height = 800; @@ -225,7 +224,7 @@ async function launchServer(options: LaunchOptions) { ...process.env }; - const args = ['--connection-token', String(crypto.randomInt(0xffffffff)), '--disable-telemetry', '--port', `${port++}`, '--driver', 'web', '--extensions-dir', extensionsPath, '--server-data-dir', agentFolder]; + const args = ['--disable-telemetry', '--port', `${port++}`, '--driver', 'web', '--extensions-dir', extensionsPath, '--server-data-dir', agentFolder]; let serverLocation: string | undefined; if (codeServerPath) {