chore: refactor cloudsql_postgresql test

appengine/cloudsql/test/createTables.test.js

@@ -57,7 +57,6 @@ const getSample = () => {
 };
 
 const stubConsole = function () {
-  /* eslint-disable no-console */
   sinon.stub(console, `error`);
   sinon.stub(console, `log`);
 };

appengine/cloudsql_postgresql/package.json

@@ -13,9 +13,9 @@
     "node": ">=8.0.0"
   },
   "scripts": {
-    "unit-test": "mocha test/*.test.js --timeout=30000",
+    "unit-test": "mocha test/createTables.test.js --timeout=30000 && mocha test/server.test.js",
     "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &",
-    "system-test": "repo-tools test app -- server.js",
+    "system-test": "mocha test/serverListening.test.js --exit",
     "system-test-proxy": "npm run start-proxy; npm run system-test",
     "all-test": "npm run unit-test && npm run system-test",
     "test": "npm -- run all-test"
@@ -27,8 +27,9 @@
     "prompt": "^1.0.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0",
     "mocha": "^7.0.0",
+    "wait-port": "^0.2.7",
+    "chai": "^4.2.0",
     "proxyquire": "^2.1.0",
     "sinon": "^9.0.0",
     "supertest": "^4.0.0"

appengine/cloudsql_postgresql/server.js

@@ -69,7 +69,6 @@ const insertVisit = (knex, visit) => {
  * @param {object} knex The Knex connection object.
  * @returns {Promise}
  */
-
 const getVisits = async (knex) => {
   const results = await knex
     .select('timestamp', 'userIp')
@@ -99,7 +98,6 @@ app.get('/', async (req, res, next) => {
 
     // Query the last 10 visits from the database.
     const visits = await getVisits(knex);
-
     res
       .status(200)
       .set('Content-Type', 'text/plain')

appengine/cloudsql_postgresql/test/createTables.test.js

@@ -132,7 +132,6 @@ describe('gae_flex_postgres_create_tables', () => {
       knex: sample.mocks.Knex,
       prompt: sample.mocks.prompt,
     });
-
     await new Promise((r) => setTimeout(r, 10));
     assert.ok(console.error.calledOnce);
     assert.ok(

appengine/cloudsql_postgresql/test/serverListening.test.js

@@ -0,0 +1,15 @@
+const waitPort = require('wait-port');
+const {expect} = require('chai');
+const PORT = process.env.PORT || 8080;
+const childProcess = require('child_process');
+const path = require('path');
+const appPath = path.join(__dirname, '../server.js');
+
+describe('server listening', () => {
+  it('should be listening', async () => {
+    const child = childProcess.exec(`node ${appPath}`);
+    const isOpen = await waitPort({port: PORT});
+    expect(isOpen).to.be.true;
+    process.kill(child.pid, 'SIGTERM');
+  });
+});

appengine/memcached/package.json

@@ -17,6 +17,6 @@
     "memjs": "^1.2.0"
   },
   "devDependencies": {
-    "@google-cloud/nodejs-repo-tools": "^3.3.0"
+  "@google-cloud/nodejs-repo-tools": "^3.3.0"
   }
 }