Merge pull request #45 from givery-technology/release-2.5.0

Release 2.5.0

Author: a-miyashita

lib/connection.js

@@ -138,7 +138,7 @@ class PostgreSQLCasette {
 			});
 		}
 
-		async function connect() {
+		async function startServer() {
 			return new Promise((_res, _rej) => {
 				let done = false;
 				const res = (...args) => {
@@ -178,19 +178,18 @@ class PostgreSQLCasette {
 			});
 		}
 
-		for (let retries = 5; retries > 0; retries--) {
-			if (fs.existsSync('/var/lib/postgresql/data/postmaster.pid')) {
-				fs.unlinkSync('/var/lib/postgresql/data/postmaster.pid');
-			}
-			try {
-				await connect();
-				break;
-			} catch (e) {
-				if (options.verbose) {
-					console.error(e);
+		if (!fs.existsSync('/var/run/postgresql/.s.PGSQL.5432')) {
+			for (let retries = 5; retries > 0; retries--) {
+				try {
+					await startServer();
+					break;
+				} catch (e) {
+					if (options.verbose) {
+						console.error(e);
+					}
 				}
+				await sleep(1000);
 			}
-			await sleep(1000);
 		}
 
 		for (let retries = 20; retries > 0; retries--) {
@@ -407,8 +406,8 @@ class Connection {
 	/**
 	 * Explicitly close the connection
 	 */
-	close() {
-		return this._conn.destroy();
+	async close() {
+		await this._conn.destroy();
 	}
 
 	/**

lib/runner.js

@@ -379,7 +379,7 @@ class TestRunner {
 							}
 						}
 					} finally {
-						conn && conn.close();
+						conn && await conn.close();
 					}
 				}
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "track-db-test-library",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Test utility for Track database challenges",
   "main": "index.js",
   "scripts": {