Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat(debug): when debugging, use zero as default timeout (#2362)

Browse source 
Otherwise, operations always time out while stepping in debugger.
This commit is contained in:
Dmitry Gozman 2020-05-27 13:25:57 -07:00 committed by GitHub
parent 37ec3a6ae6
commit 1e2b46437d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/server/browserType.ts
View file

@ -112,7 +112,7 @@ export abstract class BrowserTypeBase implements BrowserType {
} }
async _innerLaunch(options: LaunchOptions, persistent: PersistentContextOptions | undefined, userDataDir?: string): Promise<BrowserBase> { async _innerLaunch(options: LaunchOptions, persistent: PersistentContextOptions | undefined, userDataDir?: string): Promise<BrowserBase> {
const deadline = TimeoutSettings.computeDeadline(options.timeout, 30000); const deadline = TimeoutSettings.computeDeadline(options.timeout);
const logger = new RootLogger(options.logger); const logger = new RootLogger(options.logger);
logger.startLaunchRecording(); logger.startLaunchRecording();
@ -159,13 +159,13 @@ export abstract class BrowserTypeBase implements BrowserType {
assert(!(options as any).userDataDir, 'userDataDir option is not supported in `browserType.launchServer`. Use `browserType.launchPersistentContext` instead'); assert(!(options as any).userDataDir, 'userDataDir option is not supported in `browserType.launchServer`. Use `browserType.launchPersistentContext` instead');
const { port = 0 } = options; const { port = 0 } = options;
const logger = new RootLogger(options.logger); const logger = new RootLogger(options.logger);
const { browserServer, transport } = await this._launchServer(options, false, logger, TimeoutSettings.computeDeadline(options.timeout, 30000)); const { browserServer, transport } = await this._launchServer(options, false, logger, TimeoutSettings.computeDeadline(options.timeout));
browserServer._webSocketWrapper = this._wrapTransportWithWebSocket(transport, logger, port); browserServer._webSocketWrapper = this._wrapTransportWithWebSocket(transport, logger, port);
return browserServer; return browserServer;
} }
async connect(options: ConnectOptions): Promise<Browser> { async connect(options: ConnectOptions): Promise<Browser> {
const deadline = TimeoutSettings.computeDeadline(options.timeout, 30000); const deadline = TimeoutSettings.computeDeadline(options.timeout);
const logger = new RootLogger(options.logger); const logger = new RootLogger(options.logger);
logger.startLaunchRecording(); logger.startLaunchRecording();

2
src/server/electron.ts
View file

@ -168,7 +168,7 @@ export class Electron {
handleSIGTERM = true, handleSIGTERM = true,
handleSIGHUP = true, handleSIGHUP = true,
} = options; } = options;
const deadline = TimeoutSettings.computeDeadline(options.timeout, 30000); const deadline = TimeoutSettings.computeDeadline(options.timeout);
let app: ElectronApplication | undefined = undefined; let app: ElectronApplication | undefined = undefined;
const logger = new RootLogger(options.logger); const logger = new RootLogger(options.logger);

18
src/timeoutSettings.ts
View file

@ -17,8 +17,9 @@
import { TimeoutOptions } from './types'; import { TimeoutOptions } from './types';
import { helper } from './helper'; import { helper } from './helper';
import * as debugSupport from './debug/debugSupport';
const DEFAULT_TIMEOUT = 30000; const DEFAULT_TIMEOUT = debugSupport.isDebugMode() ? 0 : 30000;
export class TimeoutSettings { export class TimeoutSettings {
private _parent: TimeoutSettings | undefined; private _parent: TimeoutSettings | undefined;
@ -55,16 +56,13 @@ export class TimeoutSettings {
return DEFAULT_TIMEOUT; return DEFAULT_TIMEOUT;
} }
computeDeadline(options?: TimeoutOptions) { computeDeadline(options: TimeoutOptions = {}) {
const { timeout } = options || {}; return TimeoutSettings.computeDeadline(options.timeout, this._timeout());
return TimeoutSettings.computeDeadline(typeof timeout === 'number' ? timeout : this._timeout());
} }
static computeDeadline(timeout: number | undefined, defaultValue = 30000): number { static computeDeadline(timeout: number | undefined, defaultValue = DEFAULT_TIMEOUT): number {
if (timeout === 0) if (typeof timeout !== 'number')
return Number.MAX_SAFE_INTEGER; timeout = defaultValue;
else if (typeof timeout === 'number') return timeout ? helper.monotonicTime() + timeout : Number.MAX_SAFE_INTEGER;
return helper.monotonicTime() + timeout;
return helper.monotonicTime() + defaultValue;
} }
} }