paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 52 Packages Projects Releases Wiki Activity

Merge pull request #33214 from backstage/freben/fix-flaky-barrier-test

Browse Source 
Fix flaky createBarrier test in catalog-backend
This commit is contained in:
Fredrik Adelöw
2026-03-09 15:56:05 +01:00
committed by GitHub
parent b1352d3803 71da72d1a6
commit 7db7ee6e05
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/catalog-backend/src/processing/TaskPipeline.test.ts
+22 -13
View File
@@ -121,8 +121,13 @@ describe('startTaskPipeline', () => {
});
describe('createBarrier', () => {
const tick = (millis: number) =>
new Promise(resolve => setTimeout(resolve, millis));
beforeEach(() => {
jest.useFakeTimers();
});
afterEach(() => {
jest.useRealTimers();
});
it('abandons a wait after the timeout expires', async () => {
const abortController = new AbortController();
@@ -132,10 +137,11 @@ describe('createBarrier', () => {
const fn1 = jest.fn();
barrier.wait().then(fn1);
await tick(0);
await Promise.resolve();
expect(fn1).not.toHaveBeenCalled();
await tick(50);
jest.advanceTimersByTime(50);
await Promise.resolve();
expect(fn1).not.toHaveBeenCalled();
// start a new wait mid-way through the timeout
@@ -143,14 +149,16 @@ describe('createBarrier', () => {
const fn2 = jest.fn();
barrier.wait().then(fn2);
await tick(0);
await Promise.resolve();
expect(fn2).not.toHaveBeenCalled();
await tick(50);
jest.advanceTimersByTime(50);
await Promise.resolve();
expect(fn1).toHaveBeenCalledTimes(1);
expect(fn2).not.toHaveBeenCalled();
await tick(50);
jest.advanceTimersByTime(50);
await Promise.resolve();
expect(fn1).toHaveBeenCalledTimes(1);
expect(fn2).toHaveBeenCalledTimes(1);
});
@@ -164,16 +172,16 @@ describe('createBarrier', () => {
barrier.wait().then(fn1);
// should resolve immediately, not after timeout
await tick(0);
await Promise.resolve();
expect(fn1).not.toHaveBeenCalled();
abortController.abort();
await tick(0);
await Promise.resolve();
expect(fn1).toHaveBeenCalledTimes(1);
// subsequent waits should be immediate no matter what
const fn2 = jest.fn();
barrier.wait().then(fn2);
await tick(0);
await Promise.resolve();
expect(fn2).toHaveBeenCalledTimes(1);
});
@@ -185,7 +193,8 @@ describe('createBarrier', () => {
const fn1 = jest.fn();
barrier.wait().then(fn1);
await tick(50);
jest.advanceTimersByTime(50);
await Promise.resolve();
expect(fn1).not.toHaveBeenCalled();
// start a new wait mid-way through the timeout
@@ -193,13 +202,13 @@ describe('createBarrier', () => {
const fn2 = jest.fn();
barrier.wait().then(fn2);
await tick(0);
await Promise.resolve();
expect(fn1).not.toHaveBeenCalled();
expect(fn2).not.toHaveBeenCalled();
barrier.release();
await tick(0);
await Promise.resolve();
expect(fn1).toHaveBeenCalledTimes(1);
expect(fn2).toHaveBeenCalledTimes(1);
});