use jest.setTimeout consistently

Signed-off-by: Fredrik Adelöw <freben@gmail.com>

packages/backend-test-utils/src/database/TestDatabases.test.ts

@@ -22,12 +22,16 @@ import { TestDatabases } from './TestDatabases';
 
 const itIfDocker = isDockerDisabledForTests() ? it.skip : it;
 
+jest.setTimeout(60_000);
+
 describe('TestDatabases', () => {
   const OLD_ENV = process.env;
+
   beforeEach(() => {
     jest.resetModules();
     process.env = { ...OLD_ENV };
   });
+
   afterAll(() => {
     process.env = OLD_ENV;
   });
@@ -49,109 +53,84 @@ describe('TestDatabases', () => {
           { a: 1 },
         ]);
       },
-      60_000,
     );
   });
 
-  itIfDocker(
-    'obeys a provided connection string for postgres 13',
-    async () => {
-      const dbs = TestDatabases.create();
-      const { host, port, user, password, stop } = await startPostgresContainer(
-        'postgres:13',
-      );
+  itIfDocker('obeys a provided connection string for postgres 13', async () => {
+    const dbs = TestDatabases.create();
+    const { host, port, user, password, stop } = await startPostgresContainer(
+      'postgres:13',
+    );
 
-      try {
-        // Leave a mark
-        process.env.BACKSTAGE_TEST_DATABASE_POSTGRES13_CONNECTION_STRING = `postgresql://${user}:${password}@${host}:${port}`;
-        const input = await dbs.init('POSTGRES_13');
-        await input.schema.createTable('a', table =>
-          table.string('x').primary(),
-        );
-        await input.insert({ x: 'y' }).into('a');
+    try {
+      // Leave a mark
+      process.env.BACKSTAGE_TEST_DATABASE_POSTGRES13_CONNECTION_STRING = `postgresql://${user}:${password}@${host}:${port}`;
+      const input = await dbs.init('POSTGRES_13');
+      await input.schema.createTable('a', table => table.string('x').primary());
+      await input.insert({ x: 'y' }).into('a');
 
-        // Look for the mark
-        const database = input.client.config.connection.database;
-        const output = knexFactory({
-          client: 'pg',
-          connection: { host, port, user, password, database },
-        });
-        // eslint-disable-next-line jest/no-standalone-expect
-        await expect(output.select('x').from('a')).resolves.toEqual([
-          { x: 'y' },
-        ]);
-      } finally {
-        await stop();
-      }
-    },
-    60_000,
-  );
+      // Look for the mark
+      const database = input.client.config.connection.database;
+      const output = knexFactory({
+        client: 'pg',
+        connection: { host, port, user, password, database },
+      });
+      // eslint-disable-next-line jest/no-standalone-expect
+      await expect(output.select('x').from('a')).resolves.toEqual([{ x: 'y' }]);
+    } finally {
+      await stop();
+    }
+  });
 
-  itIfDocker(
-    'obeys a provided connection string for postgres 9',
-    async () => {
-      const dbs = TestDatabases.create();
-      const { host, port, user, password, stop } = await startPostgresContainer(
-        'postgres:9',
-      );
+  itIfDocker('obeys a provided connection string for postgres 9', async () => {
+    const dbs = TestDatabases.create();
+    const { host, port, user, password, stop } = await startPostgresContainer(
+      'postgres:9',
+    );
 
-      try {
-        // Leave a mark
-        process.env.BACKSTAGE_TEST_DATABASE_POSTGRES9_CONNECTION_STRING = `postgresql://${user}:${password}@${host}:${port}`;
-        const input = await dbs.init('POSTGRES_9');
-        await input.schema.createTable('a', table =>
-          table.string('x').primary(),
-        );
-        await input.insert({ x: 'y' }).into('a');
+    try {
+      // Leave a mark
+      process.env.BACKSTAGE_TEST_DATABASE_POSTGRES9_CONNECTION_STRING = `postgresql://${user}:${password}@${host}:${port}`;
+      const input = await dbs.init('POSTGRES_9');
+      await input.schema.createTable('a', table => table.string('x').primary());
+      await input.insert({ x: 'y' }).into('a');
 
-        // Look for the mark
-        const database = input.client.config.connection.database;
-        const output = knexFactory({
-          client: 'pg',
-          connection: { host, port, user, password, database },
-        });
-        // eslint-disable-next-line jest/no-standalone-expect
-        await expect(output.select('x').from('a')).resolves.toEqual([
-          { x: 'y' },
-        ]);
-      } finally {
-        await stop();
-      }
-    },
-    60_000,
-  );
+      // Look for the mark
+      const database = input.client.config.connection.database;
+      const output = knexFactory({
+        client: 'pg',
+        connection: { host, port, user, password, database },
+      });
+      // eslint-disable-next-line jest/no-standalone-expect
+      await expect(output.select('x').from('a')).resolves.toEqual([{ x: 'y' }]);
+    } finally {
+      await stop();
+    }
+  });
 
-  itIfDocker(
-    'obeys a provided connection string for mysql 8',
-    async () => {
-      const dbs = TestDatabases.create();
-      const { host, port, user, password, stop } = await startMysqlContainer(
-        'mysql:8',
-      );
+  itIfDocker('obeys a provided connection string for mysql 8', async () => {
+    const dbs = TestDatabases.create();
+    const { host, port, user, password, stop } = await startMysqlContainer(
+      'mysql:8',
+    );
 
-      try {
-        // Leave a mark
-        process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING = `mysql://${user}:${password}@${host}:${port}/ignored`;
-        const input = await dbs.init('MYSQL_8');
-        await input.schema.createTable('a', table =>
-          table.string('x').primary(),
-        );
-        await input.insert({ x: 'y' }).into('a');
+    try {
+      // Leave a mark
+      process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING = `mysql://${user}:${password}@${host}:${port}/ignored`;
+      const input = await dbs.init('MYSQL_8');
+      await input.schema.createTable('a', table => table.string('x').primary());
+      await input.insert({ x: 'y' }).into('a');
 
-        // Look for the mark
-        const database = input.client.config.connection.database;
-        const output = knexFactory({
-          client: 'mysql2',
-          connection: { host, port, user, password, database },
-        });
-        // eslint-disable-next-line jest/no-standalone-expect
-        await expect(output.select('x').from('a')).resolves.toEqual([
-          { x: 'y' },
-        ]);
-      } finally {
-        await stop();
-      }
-    },
-    60_000,
-  );
+      // Look for the mark
+      const database = input.client.config.connection.database;
+      const output = knexFactory({
+        client: 'mysql2',
+        connection: { host, port, user, password, database },
+      });
+      // eslint-disable-next-line jest/no-standalone-expect
+      await expect(output.select('x').from('a')).resolves.toEqual([{ x: 'y' }]);
+    } finally {
+      await stop();
+    }
+  });
 });

packages/backend-test-utils/src/database/startMysqlContainer.test.ts

@@ -20,21 +20,19 @@ import { startMysqlContainer } from './startMysqlContainer';
 
 const itIfDocker = isDockerDisabledForTests() ? it.skip : it;
 
+jest.setTimeout(60_000);
+
 describe('startMysqlContainer', () => {
-  itIfDocker(
-    'successfully launches the container',
-    async () => {
-      const { stop, ...connection } = await startMysqlContainer('mysql:8');
-      const db = createConnection({ client: 'mysql2', connection });
-      try {
-        const result = await db.select(db.raw('version() AS version'));
-        // eslint-disable-next-line jest/no-standalone-expect
-        expect(result[0]?.version).toContain('8.');
-      } finally {
-        await db.destroy();
-        await stop();
-      }
-    },
-    60_000,
-  );
+  itIfDocker('successfully launches the container', async () => {
+    const { stop, ...connection } = await startMysqlContainer('mysql:8');
+    const db = createConnection({ client: 'mysql2', connection });
+    try {
+      const result = await db.select(db.raw('version() AS version'));
+      // eslint-disable-next-line jest/no-standalone-expect
+      expect(result[0]?.version).toContain('8.');
+    } finally {
+      await db.destroy();
+      await stop();
+    }
+  });
 });

packages/backend-test-utils/src/database/startPostgresContainer.test.ts

@@ -20,23 +20,19 @@ import { startPostgresContainer } from './startPostgresContainer';
 
 const itIfDocker = isDockerDisabledForTests() ? it.skip : it;
 
+jest.setTimeout(60_000);
+
 describe('startPostgresContainer', () => {
-  itIfDocker(
-    'successfully launches the container',
-    async () => {
-      const { stop, ...connection } = await startPostgresContainer(
-        'postgres:13',
-      );
-      const db = createConnection({ client: 'pg', connection });
-      try {
-        const result = await db.select(db.raw('version()'));
-        // eslint-disable-next-line jest/no-standalone-expect
-        expect(result[0]?.version).toContain('PostgreSQL');
-      } finally {
-        await db.destroy();
-        await stop();
-      }
-    },
-    60_000,
-  );
+  itIfDocker('successfully launches the container', async () => {
+    const { stop, ...connection } = await startPostgresContainer('postgres:13');
+    const db = createConnection({ client: 'pg', connection });
+    try {
+      const result = await db.select(db.raw('version()'));
+      // eslint-disable-next-line jest/no-standalone-expect
+      expect(result[0]?.version).toContain('PostgreSQL');
+    } finally {
+      await db.destroy();
+      await stop();
+    }
+  });
 });