mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Prevent (some) CI flakes

Browse source
This commit is contained in:
trevor-signal 2023-12-01 17:16:19 -05:00 • committed by GitHub
parent b879352096
commit 582a56f52d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/test-mock/bootstrap.ts
View file

@ -63,8 +63,6 @@ for (const firstName of CONTACT_FIRST_NAMES) {
const MAX_CONTACTS = CONTACT_NAMES.length;
const DEFAULT_START_APP_TIMEOUT = 10 * durations.SECOND;
export type BootstrapOptions = Readonly<{
extraConfig?: Record<string, unknown>;
benchmark?: boolean;
@ -268,12 +266,7 @@ export class Bootstrap {
await app.close();
}
private async waitForAppToStart(app: App): Promise<void> {
await app.start();
await app.waitForDbInitialized();
}
public async startApp(timeout = DEFAULT_START_APP_TIMEOUT): Promise<App> {
public async startApp(): Promise<App> {
assert(
this.storagePath !== undefined,
'Bootstrap has to be initialized first, see: bootstrap.init()'
@ -301,11 +294,11 @@ export class Bootstrap {
});
try {
// eslint-disable-next-line no-await-in-loop
await pTimeout(this.waitForAppToStart(startedApp), timeout);
await startedApp.start();
} catch (error) {
// eslint-disable-next-line no-console
console.error(
`Failed to start the app on time, attempt ${startAttempts}, retrying`,
`Failed to start the app, attempt ${startAttempts}, retrying`,
error
);
continue;
@ -440,6 +433,9 @@ export class Bootstrap {
try {
await pTimeout(fn(bootstrap), timeout);
if (process.env.FORCE_ARTIFACT_SAVE) {
await bootstrap.saveLogs();
}
} catch (error) {
await bootstrap.saveLogs();
throw error;