Skip to content

add retries to make unit tests a little less flaky #1388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 25, 2024
Merged

add retries to make unit tests a little less flaky #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d23579b
add retries to make unit tests a little less flaky
dyc3 Feb 24, 2024
f2a17c0
format
dyc3 Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions server/tests/unit/api/user.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ describe("User API", () => {
});

afterEach(async () => {
await forcedUser.destroy();
await testUser.destroy();
await socialUser.destroy();
await forcedUser?.destroy();
await testUser?.destroy();
await socialUser?.destroy();
});

describe("GET /user", () => {
Expand Down
90 changes: 51 additions & 39 deletions server/tests/unit/roommanager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,46 +26,58 @@ describe("Room manager", () => {
});

describe("creating a room", () => {
it("should never save null to permissions or user role columns", async () => {
const roomName = "foo-76kdf943";
await roommanager.createRoom({ name: roomName, isTemporary: false, title: "asdf1234" });
const room = await DbRoom.findOne({ where: { name: roomName } });
expect(room).not.toBeNull();
expect(room?.permissions).not.toBeNull();
expect(room?.permissions).toBeInstanceOf(Array);
// eslint-disable-next-line vitest/no-conditional-in-test
if (Array.isArray(room?.permissions)) {
let roles = room?.permissions.map(p => p[0]);
expect(roles).not.toContain(Role.Administrator);
expect(roles).not.toContain(Role.Owner);
}
expect(room?.["role-admin"]).toBeInstanceOf(Array);
expect(room?.["role-mod"]).toBeInstanceOf(Array);
expect(room?.["role-trusted"]).toBeInstanceOf(Array);
await room?.destroy();
});
it(
"should never save null to permissions or user role columns",
async () => {
const roomName = "foo-76kdf943";
await roommanager.createRoom({
name: roomName,
isTemporary: false,
title: "asdf1234",
});
const room = await DbRoom.findOne({ where: { name: roomName } });
expect(room).not.toBeNull();
expect(room?.permissions).not.toBeNull();
expect(room?.permissions).toBeInstanceOf(Array);
// eslint-disable-next-line vitest/no-conditional-in-test
if (Array.isArray(room?.permissions)) {
let roles = room?.permissions.map(p => p[0]);
expect(roles).not.toContain(Role.Administrator);
expect(roles).not.toContain(Role.Owner);
}
expect(room?.["role-admin"]).toBeInstanceOf(Array);
expect(room?.["role-mod"]).toBeInstanceOf(Array);
expect(room?.["role-trusted"]).toBeInstanceOf(Array);
await room?.destroy();
},
{ retry: 2 }
);

it("should be able to load saved settings from database", async () => {
const roomName = "foo-a3b5e323";
await roommanager.createRoom({
name: roomName,
isTemporary: false,
title: "asdf1234",
description: "0987asdf",
visibility: Visibility.Unlisted,
queueMode: QueueMode.Vote,
});
const room = await DbRoom.findOne({ where: { name: roomName } });
expect(room).not.toBeNull();
expect(room).toMatchObject({
name: roomName,
title: "asdf1234",
description: "0987asdf",
visibility: Visibility.Unlisted,
queueMode: QueueMode.Vote,
});
await room?.destroy();
});
it(
"should be able to load saved settings from database",
async () => {
const roomName = "foo-a3b5e323";
await roommanager.createRoom({
name: roomName,
isTemporary: false,
title: "asdf1234",
description: "0987asdf",
visibility: Visibility.Unlisted,
queueMode: QueueMode.Vote,
});
const room = await DbRoom.findOne({ where: { name: roomName } });
expect(room).not.toBeNull();
expect(room).toMatchObject({
name: roomName,
title: "asdf1234",
description: "0987asdf",
visibility: Visibility.Unlisted,
queueMode: QueueMode.Vote,
});
await room?.destroy();
},
{ retry: 2 }
);
});

describe("loading from redis", () => {
Expand Down
52 changes: 25 additions & 27 deletions server/tests/unit/storage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,33 +204,31 @@ describe("Storage: Room Spec", () => {
expect(room?.grants).toEqual(new permissions.Grants());
});

it("should save and load userRoles correctly", async () => {
let userRoles = new Map([
[2, new Set([1, 2, 3])],
[3, new Set([4])],
[4, new Set([8, 9])],
]);
await storage.saveRoom(new Room({ name: "example", userRoles }));

const wait = new Promise(resolve => setTimeout(resolve, 200));
await wait;

let room = await storage.getRoomByName("example");
expect(room?.userRoles).toEqual(userRoles);

userRoles = new Map([
[2, new Set([1, 3])],
[3, new Set([4, 7])],
[4, new Set([8])],
]);
await storage.updateRoom({ name: "example", userRoles });

const wait2 = new Promise(resolve => setTimeout(resolve, 200));
await wait2;

room = await storage.getRoomByName("example");
expect(room?.userRoles).toEqual(userRoles);
});
it(
"should save and load userRoles correctly",
async () => {
let userRoles = new Map([
[2, new Set([1, 2, 3])],
[3, new Set([4])],
[4, new Set([8, 9])],
]);
await storage.saveRoom(new Room({ name: "example", userRoles }));

let room = await storage.getRoomByName("example");
expect(room?.userRoles).toEqual(userRoles);

userRoles = new Map([
[2, new Set([1, 3])],
[3, new Set([4, 7])],
[4, new Set([8])],
]);
await storage.updateRoom({ name: "example", userRoles });

room = await storage.getRoomByName("example");
expect(room?.userRoles).toEqual(userRoles);
},
{ retry: 2 }
);
});

describe("Storage: CachedVideos Spec", () => {
Expand Down