Skip to content

Commit

Permalink
test: Fix flaky task-runner integration test (n8n-io#11302)
Browse files Browse the repository at this point in the history
  • Loading branch information
tomi authored Oct 18, 2024
1 parent 0be04c6 commit 0aae47c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
12 changes: 8 additions & 4 deletions packages/cli/src/runners/task-runner-process.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@ export class TaskRunnerProcess {
return this.process?.pid;
}

/** Promise that resolves when the process has exited */
public get runPromise() {
return this._runPromise;
}

private process: ChildProcess | null = null;

/** Promise that resolves after the process has exited */
private runPromise: Promise<void> | null = null;
private _runPromise: Promise<void> | null = null;

private isShuttingDown = false;

Expand Down Expand Up @@ -97,7 +101,7 @@ export class TaskRunnerProcess {
} else {
this.killNode();
}
await this.runPromise;
await this._runPromise;

this.isShuttingDown = false;
}
Expand Down Expand Up @@ -128,7 +132,7 @@ export class TaskRunnerProcess {
}

private monitorProcess(taskRunnerProcess: ChildProcess) {
this.runPromise = new Promise((resolve) => {
this._runPromise = new Promise((resolve) => {
taskRunnerProcess.on('exit', (code) => {
this.onProcessExit(code, resolve);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ describe('TaskRunnerProcess', () => {
// @ts-expect-error private property
runnerProcess.process?.kill('SIGKILL');

// Assert
// Wait until the runner is running again
await retryUntil(() => expect(runnerProcess.isRunning).toBeTruthy());
expect(runnerProcess.pid).not.toBe(processId);
// Wait until the runner has exited
await runnerProcess.runPromise;

// Assert
// Wait until the runner has connected again
await retryUntil(() => expect(getNumConnectedRunners()).toBe(1));
expect(getNumConnectedRunners()).toBe(1);
expect(getNumRegisteredRunners()).toBe(1);
expect(runnerProcess.pid).not.toBe(processId);
});

it('should launch runner directly if not using a launcher', async () => {
Expand Down

0 comments on commit 0aae47c

Please sign in to comment.