From 6a54b58303002bc42cc62df7511631172554b37b Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 11 Jun 2024 16:00:04 +0100 Subject: [PATCH] ? --- packages/server/specs/openapi.json | 12 +++++++++--- packages/server/specs/openapi.yaml | 6 ++++++ .../server/src/integrations/tests/utils/index.ts | 13 +++++-------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/packages/server/specs/openapi.json b/packages/server/specs/openapi.json index 7d07b424f0..b21554505b 100644 --- a/packages/server/specs/openapi.json +++ b/packages/server/specs/openapi.json @@ -860,8 +860,10 @@ "json", "internal", "barcodeqr", + "signature_single", "bigint", - "bb_reference" + "bb_reference", + "bb_reference_single" ], "description": "Defines the type of the column, most explain themselves, a link column is a relationship." }, @@ -1067,8 +1069,10 @@ "json", "internal", "barcodeqr", + "signature_single", "bigint", - "bb_reference" + "bb_reference", + "bb_reference_single" ], "description": "Defines the type of the column, most explain themselves, a link column is a relationship." }, @@ -1285,8 +1289,10 @@ "json", "internal", "barcodeqr", + "signature_single", "bigint", - "bb_reference" + "bb_reference", + "bb_reference_single" ], "description": "Defines the type of the column, most explain themselves, a link column is a relationship." }, diff --git a/packages/server/specs/openapi.yaml b/packages/server/specs/openapi.yaml index 3a798c424b..6a2ae89c61 100644 --- a/packages/server/specs/openapi.yaml +++ b/packages/server/specs/openapi.yaml @@ -782,8 +782,10 @@ components: - json - internal - barcodeqr + - signature_single - bigint - bb_reference + - bb_reference_single description: Defines the type of the column, most explain themselves, a link column is a relationship. constraints: @@ -948,8 +950,10 @@ components: - json - internal - barcodeqr + - signature_single - bigint - bb_reference + - bb_reference_single description: Defines the type of the column, most explain themselves, a link column is a relationship. constraints: @@ -1121,8 +1125,10 @@ components: - json - internal - barcodeqr + - signature_single - bigint - bb_reference + - bb_reference_single description: Defines the type of the column, most explain themselves, a link column is a relationship. constraints: diff --git a/packages/server/src/integrations/tests/utils/index.ts b/packages/server/src/integrations/tests/utils/index.ts index a462cdce05..d9a2960848 100644 --- a/packages/server/src/integrations/tests/utils/index.ts +++ b/packages/server/src/integrations/tests/utils/index.ts @@ -80,19 +80,16 @@ export async function startContainer(container: GenericContainer) { `${imageName.replaceAll("/", "-")}.lock` ) - // The `proper-lockfile` library needs the file we're locking on to exist - // before it can lock it. - if (!fs.existsSync(lockPath)) { - fs.writeFileSync(lockPath, "") - } - - const unlock = lockfile.lockSync(lockPath) + const unlock = await lockfile.lock(lockPath, { + retries: 10, + realpath: false, + }) let startedContainer: StartedTestContainer try { startedContainer = await container.start() } finally { - unlock() + await unlock() } const info = testContainerUtils.getContainerById(startedContainer.getId())