HARMONY-1538: Move test dB to local directories to

fix issues when running tests in parallel
nasa · Oct 12, 2023 · 243aa34 · 243aa34
1 parent 0dacf0b
commit 243aa34
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 144 deletions.
diff --git a/bin/create-database b/bin/create-database
@@ -35,4 +35,5 @@ if [ -f $database ]; then
 fi
 
 echo "Creating database $database"
-cat db/db.sql | sqlite3 $database
+dir=$(dirname "$0")
+cat "$dir/../db/db.sql" | sqlite3 $database
diff --git a/db/knexfile.js b/db/knexfile.js
@@ -5,7 +5,8 @@ const migrations = { directory: path.resolve(__dirname, 'migrations') };
 const sqliteConfig = {
   client: 'sqlite3',
   connection: {
-    filename: path.resolve(__dirname, 'test.sqlite3'),
+    filename: path.resolve('db', 'test.sqlite3'),
+    // filename: path.resolve(__dirname, 'test.sqlite3'),
   },
   useNullAsDefault: true,
   migrations,

diff --git a/package.json b/package.json
@@ -7,16 +7,16 @@
     "test": "lerna run test",
     "test-fast": "lerna run test-fast",
     "test-bail": "lerna run test-bail",
-    "coverage": "lerna run --concurrency 1 coverage",
+    "coverage": "lerna run coverage",
     "lint": "lerna run lint",
     "start": "cd services/harmony && NODE_OPTIONS=--max-old-space-size=3096 ts-node -r tsconfig-paths/register app/server.ts",
     "start-dev": "cd servcies/harmony && strict-npm-engines && ts-node-dev --no-notify -r tsconfig-paths/register --watch app/views,public/js --respawn app/server",
     "start-dev-fast": "cd services/harmony && TS_NODE_TRANSPILE_ONLY=true ts-node-dev --no-notify -r tsconfig-paths/register --respawn --inspect=127.0.0.1:${DEBUG_PORT:-9200} app/server",
     "update-dev": "npm install && lerna run build && bin/restart-services",
     "watch-debug": "cd servcies/harmony && TS_NODE_TRANSPILE_ONLY=true nodemon --inspect=5858 -e ts,tsx,html --exec node -r tsconfig-paths/register -r ts-node/register app/server.ts",
     "postinstall": "if test \"$NODE_ENV\" != \"production\" && test \"$LERNA\" != \"false\" ; then lerna exec -- npm install; fi",
-    "build": "lerna run build --scope=harmony -- VERSION=${VERSION:-latest}",
-    "build-all": "lerna exec -- VERSION=${VERSION:-latest} npm run build-m1",
+    "build": "lerna exec --scope=harmony -- VERSION=${VERSION:-latest} npm run build",
+    "build-all": "lerna exec --ignore harmony -- VERSION=${VERSION:-latest} npm run build",
     "build-all-m1": "lerna exec --ignore harmony -- VERSION=${VERSION:-latest} npm run build-m1",
     "push-image-all": "lerna exec --ignore harmony --ignore @harmony/util --concurrency 1 -- ./bin/push-image ${VERSION:-latest}",
     "build-notebooks-image": "docker build --platform linux/amd64 -t harmonyservices/notebooks:${VERSION:-latest} -f Dockerfile-notebooks .",

diff --git a/services/harmony/db/.gitkeep b/services/harmony/db/.gitkeep
diff --git a/services/harmony/test/helpers/db.ts b/services/harmony/test/helpers/db.ts
@@ -20,14 +20,14 @@ export async function truncateAll(): Promise<void> {
   await Promise.all(tables.map((t) => db(t).truncate()));
 }
 
-const createDatabaseCommand = './bin/create-database -o test';
+const createDatabaseCommand = '../../bin/create-database -o test';
 
 /**
  * Recreates the test database
  * Note this is done because database migrations do not work for sqlite
  */
 async function recreateDatabase(): Promise<void> {
-  return exec(createDatabaseCommand, { 'cwd': '../..' });
+  return exec(createDatabaseCommand);
 }
 
 before(async function () {

diff --git a/services/work-failer/db/.gitkeep b/services/work-failer/db/.gitkeep
diff --git a/services/work-failer/test/helpers/db.ts b/services/work-failer/test/helpers/db.ts
@@ -20,7 +20,7 @@ export async function truncateAll(): Promise<void> {
   await Promise.all(tables.map((t) => db(t).truncate()));
 }
 
-const createDatabaseCommand = './bin/create-database -o test';
+const createDatabaseCommand = '../../bin/create-database -o test';
 
 /**
  * Recreates the test database

diff --git a/services/work-reaper/db/.gitkeep b/services/work-reaper/db/.gitkeep
diff --git a/services/work-reaper/db/db.sql b/services/work-reaper/db/db.sql
diff --git a/services/work-reaper/test/helpers/db.ts b/services/work-reaper/test/helpers/db.ts
@@ -20,7 +20,7 @@ export async function truncateAll(): Promise<void> {
   await Promise.all(tables.map((t) => db(t).truncate()));
 }
 
-const createDatabaseCommand = './bin/create-database -o test';
+const createDatabaseCommand = '../../bin/create-database -o test';
 
 /**
  * Recreates the test database