api: Fix tests

livepeer · Apr 26, 2024 · fb9aa19 · fb9aa19
1 parent 5b65876
commit fb9aa19
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 16 deletions.
diff --git a/packages/api/src/controllers/webhook.test.js → packages/api/src/controllers/webhook.test.ts b/packages/api/src/controllers/webhook.test.js → packages/api/src/controllers/webhook.test.ts
@@ -1,6 +1,8 @@
 import serverPromise from "../test-server";
 import { TestClient, clearDatabase } from "../test-helpers";
 import { sleep } from "../util";
+import { jobsDb } from "../store";
+import { Webhook } from "../schema/types";
 
 let server;
 let mockAdminUser;
@@ -288,8 +290,22 @@ describe("controllers/webhook", () => {
       });
       expect(setActiveRes).toBeDefined();
       expect(setActiveRes.status).toBe(204);
-      // const setActiveResJson = await setActiveRes.json()
-      // expect(setActiveResJson).toBeDefined()
+
+      let hooksCalled = 0;
+      for (let i = 0; i < 5 && hooksCalled < 2; i++) {
+        await sleep(500);
+
+        hooksCalled = 0;
+        for (const id of [webhookResJson.id, webhookResJson2.id]) {
+          const res = await client.get(`/webhook/${id}`);
+          expect(res.status).toBe(200);
+          const { status } = (await res.json()) as Webhook;
+          if (status.lastTriggeredAt >= now) {
+            hooksCalled++;
+          }
+        }
+      }
+      expect(hooksCalled).toBe(2);
     }, 20000);
 
     it("records webhook logs", async () => {

diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
@@ -71,7 +71,8 @@ export default async function makeApp(params: CliArgs) {
     process.off("unhandledRejection", unhandledRejection);
     listener?.close();
     await tracking.flushAll();
-    await store.close();
+    await db.close();
+    await jobsDb.close();
   };
 
   // Handle SIGTERM gracefully. It's polite, and Kubernetes likes it.

diff --git a/packages/api/src/store/db.ts b/packages/api/src/store/db.ts
@@ -285,3 +285,6 @@ async function ensureDatabase(postgresUrl: string) {
   pool.end();
   adminPool.end();
 }
+
+export const db = new DB();
+export const jobsDb = new DB();
diff --git a/packages/api/src/store/experiment-table.ts b/packages/api/src/store/experiment-table.ts
@@ -1,7 +1,7 @@
 import sql from "sql-template-strings";
 
 import { Experiment } from "../schema/types";
-import { db } from ".";
+import { db } from "./db";
 import { ForbiddenError, NotFoundError } from "./errors";
 import Table from "./table";
 import { WithID } from "./types";

diff --git a/packages/api/src/store/index.ts b/packages/api/src/store/index.ts
@@ -1,8 +1,7 @@
 import Model from "./model";
-import { DB, PostgresParams } from "./db";
+import { db, jobsDb, DB, PostgresParams } from "./db";
 
-export const db = new DB();
-export const jobsDb = new DB();
+export { db, jobsDb };
 
 // Helper function to start database and boot up legacy store
 export default async function makeStore(

diff --git a/packages/api/src/store/model.ts b/packages/api/src/store/model.ts
@@ -191,8 +191,4 @@ export default class Model implements IStore {
 
     return responses;
   }
-
-  async close() {
-    return this.db.close();
-  }
 }
diff --git a/packages/api/src/types/common.d.ts b/packages/api/src/types/common.d.ts
@@ -88,7 +88,6 @@ export interface IStore {
   ready: Promise<void>;
 
   get<T extends StoredObject>(id: string, cleanWriteOnly?: boolean): Promise<T>;
-  close(): Promise<void>;
   replace(data: StoredObject): Promise<void>;
   list<T = StoredObject>(
     args: IStoreListArgs

diff --git a/packages/api/src/webhooks/cannon.test.ts b/packages/api/src/webhooks/cannon.test.ts
@@ -286,8 +286,7 @@ describe("webhook cannon", () => {
       expect(callCount).toBe(1);
       expect(receivedEvent).toBe("stream.started");
 
-      // at this point the semaphore is re-acquired cause we just waited (acquired) above
-
+      sem = semaphore();
       await server.queue.publishWebhook("events.stream.idle", {
         type: "webhook_event",
         id: "webhook_test_42",
@@ -302,6 +301,7 @@ describe("webhook cannon", () => {
       expect(receivedEvent).toBe("stream.idle");
 
       // does not receive some random event
+      sem = semaphore();
       await server.queue.publishWebhook("events.stream.unknown" as any, {
         type: "webhook_event",
         id: "webhook_test_93",
@@ -311,8 +311,7 @@ describe("webhook cannon", () => {
         userId: nonAdminUser.id,
       });
 
-      const err = await sem.wait(1000).catch((err) => err);
-      expect(err?.message).toBe("timeout");
+      await sem.wait(1000);
       expect(callCount).toBe(2);
     });