From 3e2010fb264fd2008a19f246b15ebf4320362fe8 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 18 Aug 2023 14:18:47 +0100
Subject: [PATCH] Attempting to improve on test flakiness, don't depend on a
timeout for docker startup, wait for port to respond.
---
jestTestcontainersConfigGenerator.js | 27 +++++++++++++++----
.../core/utilities/testContainerUtils.ts | 21 +++------------
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/jestTestcontainersConfigGenerator.js b/jestTestcontainersConfigGenerator.js
index 4b94cf5016..4b8afe327d 100644
--- a/jestTestcontainersConfigGenerator.js
+++ b/jestTestcontainersConfigGenerator.js
@@ -1,9 +1,26 @@
module.exports = () => {
return {
- dockerCompose: {
- composeFilePath: "../../hosting",
- composeFile: "docker-compose.test.yaml",
- startupTimeout: 10000,
- },
+ couchdb: {
+ image: "budibase/couchdb",
+ ports: [5984],
+ env: {
+ COUCHDB_PASSWORD: "budibase",
+ COUCHDB_USER: "budibase",
+ },
+ wait: {
+ type: "ports",
+ timeout: 10000,
+ }
+ }
}
}
+
+// module.exports = () => {
+// return {
+// dockerCompose: {
+// composeFilePath: "../../hosting",
+// composeFile: "docker-compose.test.yaml",
+// startupTimeout: 10000,
+// },
+// }
+// }
diff --git a/packages/backend-core/tests/core/utilities/testContainerUtils.ts b/packages/backend-core/tests/core/utilities/testContainerUtils.ts
index f6c702f7ef..7da6cbc777 100644
--- a/packages/backend-core/tests/core/utilities/testContainerUtils.ts
+++ b/packages/backend-core/tests/core/utilities/testContainerUtils.ts
@@ -32,8 +32,8 @@ function getTestContainerSettings(
): string | null {
const entry = Object.entries(global).find(
([k]) =>
- k.includes(`_${serverName.toUpperCase()}`) &&
- k.includes(`_${key.toUpperCase()}__`)
+ k.includes(`${serverName.toUpperCase()}`) &&
+ k.includes(`${key.toUpperCase()}`)
)
if (!entry) {
return null
@@ -67,27 +67,14 @@ function getContainerInfo(containerName: string, port: number) {
}
function getCouchConfig() {
- return getContainerInfo("couchdb-service", 5984)
-}
-
-function getMinioConfig() {
- return getContainerInfo("minio-service", 9000)
-}
-
-function getRedisConfig() {
- return getContainerInfo("redis-service", 6379)
+ return getContainerInfo("couchdb", 5984)
}
export function setupEnv(...envs: any[]) {
- const couch = getCouchConfig(),
- minio = getCouchConfig(),
- redis = getRedisConfig()
+ const couch = getCouchConfig()
const configs = [
{ key: "COUCH_DB_PORT", value: couch.port },
{ key: "COUCH_DB_URL", value: couch.url },
- { key: "MINIO_PORT", value: minio.port },
- { key: "MINIO_URL", value: minio.url },
- { key: "REDIS_URL", value: redis.url },
]
for (const config of configs.filter(x => !!x.value)) {