mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-18 23:59:43 +01:00
Bug fixes
This commit is contained in:
@@ -584,4 +584,18 @@ export class TestContext {
|
||||
}
|
||||
return url.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a random alphanumeric token of length 10.
|
||||
*/
|
||||
public getRandomToken(): string {
|
||||
return Array.from({ length: 10 }, () => Math.floor(Math.random() * 36).toString(36)).join('');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a random port number between 3000 and 9999.
|
||||
*/
|
||||
public getRandomPort(): string {
|
||||
return String(Math.floor(Math.random() * 7000) + 3000);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import { UITest } from './uiTest';
|
||||
export function setup(context: TestContext) {
|
||||
describe('Desktop', () => {
|
||||
if (context.platform === 'darwin-x64') {
|
||||
it('desktop-darwin', async () => {
|
||||
it('desktop-darwin-x64', async () => {
|
||||
const dir = await context.downloadAndUnpack('darwin');
|
||||
const entryPoint = context.installMacApp(dir);
|
||||
await testDesktopApp(entryPoint);
|
||||
|
||||
@@ -85,7 +85,11 @@ export function setup(context: TestContext) {
|
||||
}
|
||||
|
||||
async function testServer(entryPoint: string) {
|
||||
const args = ['--accept-server-license-terms', '--connection-token', '12345'];
|
||||
const args = [
|
||||
'--accept-server-license-terms',
|
||||
'--connection-token', context.getRandomToken(),
|
||||
'--port', context.getRandomPort()
|
||||
];
|
||||
|
||||
context.log(`Starting server ${entryPoint} with args ${args.join(' ')}`);
|
||||
const server = spawn(entryPoint, args, { shell: true, detached: os.platform() !== 'win32' });
|
||||
|
||||
@@ -86,12 +86,11 @@ export function setup(context: TestContext) {
|
||||
}
|
||||
|
||||
async function testServer(entryPoint: string) {
|
||||
const token = Array.from({ length: 10 }, () => Math.floor(Math.random() * 36).toString(36)).join('');
|
||||
const port = String(Math.floor(Math.random() * 7000) + 3000);
|
||||
const token = context.getRandomToken();
|
||||
const test = new UITest(context);
|
||||
const args = [
|
||||
'--accept-server-license-terms',
|
||||
'--port', port,
|
||||
'--port', context.getRandomPort(),
|
||||
'--connection-token', token,
|
||||
'--server-data-dir', context.createTempDir(),
|
||||
'--extensions-dir', test.extensionsDir,
|
||||
|
||||
Reference in New Issue
Block a user