From bd9e5dd5ef9a37660595d84443052b95987648e0 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 1 Apr 2020 11:53:07 -0700 Subject: [PATCH 01/48] chore: refactor cloudsql_postgresql --- appengine/cloudsql_postgresql/package.json | 6 ++++-- .../test/serverListening.test.js | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 appengine/cloudsql_postgresql/test/serverListening.test.js diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index efe30faf08..b003d860ee 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/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 --timeout=30000", "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 --timeout=30000", "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" @@ -29,6 +29,8 @@ "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" diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js new file mode 100644 index 0000000000..00cff58412 --- /dev/null +++ b/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'); + }); +}); From 5e8395e2674c043a64bd3a8b3c58ead103e6641b Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 9 Apr 2020 21:13:00 -0700 Subject: [PATCH 02/48] check: user, password and database env variables --- appengine/cloudsql_postgresql/test/serverListening.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 00cff58412..2f87022b7f 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -10,6 +10,9 @@ describe('server listening', () => { const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; + process.stdout.write(`sql user: ${process.env.SQL_USER}, + password: ${process.env.SQL_PASSWORD}, + database: ${process.env.SQL_DATABASE}`); process.kill(child.pid, 'SIGTERM'); }); }); From e6b13b00d40bc2b7a4a9c3100af1a330566aedf2 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 15 Apr 2020 17:35:53 -0700 Subject: [PATCH 03/48] fix: try killing child process --- .../cloudsql_postgresql/test/serverListening.test.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 2f87022b7f..8e3c4945af 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -13,6 +13,13 @@ describe('server listening', () => { process.stdout.write(`sql user: ${process.env.SQL_USER}, password: ${process.env.SQL_PASSWORD}, database: ${process.env.SQL_DATABASE}`); - process.kill(child.pid, 'SIGTERM'); + try { + process.kill(child.pid, 'SIGTERM'); + // eslint-disable-next-line no-empty + } catch (err) {} + try { + child.kill('SIGTERM'); + // eslint-disable-next-line no-empty + } catch (err) {} }); }); From dd5039c711844cf88e938a87937da60781c64ca2 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 10:09:10 -0700 Subject: [PATCH 04/48] try --- appengine/cloudsql_postgresql/package.json | 2 +- .../test/serverListening.test.js | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index b003d860ee..c2c811f672 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -17,7 +17,7 @@ "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &", "system-test": "mocha test/serverListening.test.js --timeout=30000", "system-test-proxy": "npm run start-proxy; npm run system-test", - "all-test": "npm run unit-test && npm run system-test", + "all-test": "npm run system-test", "test": "npm -- run all-test" }, "dependencies": { diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 8e3c4945af..605ebb1cb4 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -6,20 +6,11 @@ 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.stdout.write(`sql user: ${process.env.SQL_USER}, - password: ${process.env.SQL_PASSWORD}, - database: ${process.env.SQL_DATABASE}`); - try { + it('should be listening', () => { + const child = childProcess.spawn('node', [appPath]).on('exit', () => { + const isOpen = waitPort({port: PORT}); + expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); - // eslint-disable-next-line no-empty - } catch (err) {} - try { - child.kill('SIGTERM'); - // eslint-disable-next-line no-empty - } catch (err) {} + }); }); }); From a755c79a291bfe57bdba1700202db8b070b7b687 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 10:10:42 -0700 Subject: [PATCH 05/48] try --- .../test/serverListening.test.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 605ebb1cb4..2f87022b7f 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -6,11 +6,13 @@ const path = require('path'); const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { - it('should be listening', () => { - const child = childProcess.spawn('node', [appPath]).on('exit', () => { - const isOpen = waitPort({port: PORT}); - expect(isOpen).to.be.true; - process.kill(child.pid, 'SIGTERM'); - }); + it('should be listening', async () => { + const child = childProcess.exec(`node ${appPath}`); + const isOpen = await waitPort({port: PORT}); + expect(isOpen).to.be.true; + process.stdout.write(`sql user: ${process.env.SQL_USER}, + password: ${process.env.SQL_PASSWORD}, + database: ${process.env.SQL_DATABASE}`); + process.kill(child.pid, 'SIGTERM'); }); }); From f025e8949748b3c3c0b23542ba548e79feba43f5 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 11:43:22 -0700 Subject: [PATCH 06/48] try --- appengine/cloudsql_postgresql/package.json | 2 +- appengine/cloudsql_postgresql/server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index c2c811f672..b003d860ee 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -17,7 +17,7 @@ "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &", "system-test": "mocha test/serverListening.test.js --timeout=30000", "system-test-proxy": "npm run start-proxy; npm run system-test", - "all-test": "npm run system-test", + "all-test": "npm run unit-test && npm run system-test", "test": "npm -- run all-test" }, "dependencies": { diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js index ba06e57c4a..48755920d5 100644 --- a/appengine/cloudsql_postgresql/server.js +++ b/appengine/cloudsql_postgresql/server.js @@ -23,7 +23,7 @@ const Knex = require('knex'); const crypto = require('crypto'); const app = express(); -app.enable('trust proxy'); +//app.enable('trust proxy'); const connect = () => { // [START gae_flex_postgres_connect] From 620bda926569288c4676607e49ee7524a0bc05f8 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:20:25 -0700 Subject: [PATCH 07/48] try --- appengine/cloudsql_postgresql/package.json | 4 ++-- appengine/cloudsql_postgresql/server.js | 4 +--- appengine/cloudsql_postgresql/test/createTables.test.js | 1 - appengine/cloudsql_postgresql/test/server.test.js | 1 + .../cloudsql_postgresql/test/serverListening.test.js | 9 +++------ 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index b003d860ee..c5066c0d4d 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -13,9 +13,9 @@ "node": ">=8.0.0" }, "scripts": { - "unit-test": "mocha test/createTables.test.js --timeout=30000 && mocha test/server.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": "mocha test/serverListening.test.js --timeout=30000", + "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" diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js index 48755920d5..4c00ba85cc 100644 --- a/appengine/cloudsql_postgresql/server.js +++ b/appengine/cloudsql_postgresql/server.js @@ -23,7 +23,7 @@ const Knex = require('knex'); const crypto = require('crypto'); const app = express(); -//app.enable('trust proxy'); +app.enable('trust proxy'); const connect = () => { // [START gae_flex_postgres_connect] @@ -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') diff --git a/appengine/cloudsql_postgresql/test/createTables.test.js b/appengine/cloudsql_postgresql/test/createTables.test.js index 545e95647a..c61b68683a 100644 --- a/appengine/cloudsql_postgresql/test/createTables.test.js +++ b/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( diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index 9b104dab6c..db82650bbd 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,6 +72,7 @@ const getSample = () => { }; }; + it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 2f87022b7f..375f064089 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -7,12 +7,9 @@ const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { it('should be listening', async () => { - const child = childProcess.exec(`node ${appPath}`); + //const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; - process.stdout.write(`sql user: ${process.env.SQL_USER}, - password: ${process.env.SQL_PASSWORD}, - database: ${process.env.SQL_DATABASE}`); - process.kill(child.pid, 'SIGTERM'); + //process.kill(child.pid, 'SIGTERM'); }); -}); +}); \ No newline at end of file From 7ac61b65575b149767829a5758894b154c346fb2 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:26:03 -0700 Subject: [PATCH 08/48] try --- appengine/cloudsql_postgresql/test/serverListening.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 375f064089..5f4784cba7 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -7,9 +7,9 @@ const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { it('should be listening', async () => { - //const child = childProcess.exec(`node ${appPath}`); + const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; - //process.kill(child.pid, 'SIGTERM'); + process.kill(child.pid, 'SIGTERM'); }); }); \ No newline at end of file From a58dd3adf72e99b9192ccebd24a7ce590bc8c343 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:30:02 -0700 Subject: [PATCH 09/48] npm: runfix --- appengine/cloudsql/test/createTables.test.js | 1 - appengine/cloudsql_postgresql/test/server.test.js | 1 - appengine/cloudsql_postgresql/test/serverListening.test.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/appengine/cloudsql/test/createTables.test.js b/appengine/cloudsql/test/createTables.test.js index b79ac4bd28..2d7d832ed4 100644 --- a/appengine/cloudsql/test/createTables.test.js +++ b/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`); }; diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index db82650bbd..9b104dab6c 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,7 +72,6 @@ const getSample = () => { }; }; - it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 5f4784cba7..00cff58412 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -12,4 +12,4 @@ describe('server listening', () => { expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); }); -}); \ No newline at end of file +}); From 55ea26c2e0a611c3e511f075049f890d16ca8f5b Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 14:28:07 -0700 Subject: [PATCH 10/48] fix: remove repo-tools dependency --- appengine/memcached/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index 021dffe7a0..1861f69fc6 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -15,8 +15,5 @@ "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" - }, - "devDependencies": { - "@google-cloud/nodejs-repo-tools": "^3.3.0" } } From 7c3b6cc4b3b9518e7c03f425c48baf89393136ad Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 14:38:23 -0700 Subject: [PATCH 11/48] fix dependencies --- appengine/cloudsql_postgresql/package.json | 1 - appengine/memcached/package.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index c5066c0d4d..c0d1de08ad 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -27,7 +27,6 @@ "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", diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index 1861f69fc6..2f6d3f7df4 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -15,5 +15,8 @@ "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" + }, + "devDependencies": { + "@google-cloud/nodejs-repo-tools": "^3.3.0" } } From ad7a24527d0a551e5e20e5fdb727325a5b7ef7c8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 16 Apr 2020 23:52:10 +0200 Subject: [PATCH 12/48] chore(deps): update dependency puppeteer to v3 (#1719) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [puppeteer](https://togithub.com/puppeteer/puppeteer) | devDependencies | major | [`^2.0.0` -> `^3.0.0`](https://renovatebot.com/diffs/npm/puppeteer/2.1.1/3.0.0) | --- ### Release Notes
puppeteer/puppeteer ### [`v3.0.0`](https://togithub.com/puppeteer/puppeteer/releases/v3.0.0) [Compare Source](https://togithub.com/puppeteer/puppeteer/compare/v2.1.1...v3.0.0) #### Big changes - Chromium 81.0.4044.0 (r737027) - Puppeteer can now fetch a Firefox Nightly binary for you via `PUPPETEER_PRODUCT=firefox npm install`. Also, there’s now [an example](https://togithub.com/puppeteer/puppeteer/blob/master/examples/cross-browser.js) showing how to launch Firefox with Puppeteer. - File uploads are generally more reliable ([#​5363](https://togithub.com/puppeteer/puppeteer/issues/5363)) and `elementHandle.uploadFile(...filePaths)` now triggers a `change` event, matching the old behavior in Puppeteer v1.20.0. ([#​5389](https://togithub.com/puppeteer/puppeteer/issues/5389)) - Node.js v8.x.x is no longer supported. ([#​5136](https://togithub.com/puppeteer/puppeteer/issues/5136)) #### Behind the scenes - Puppeteer is migrating to TypeScript. Although this doesn't affect the way developers can consume Puppeteer, it improves the quality of the Puppeteer type definitions which can be used by modern editors. - Our custom test runner framework has been removed in favor of Mocha, reducing maintenance overhead. - Our CI setup and the way we deal with test flakiness is being reworked in order to increase our confidence of landing PRs without breaking anything. #### Raw notes [`6760b92`](https://togithub.com/puppeteer/puppeteer/commit/6760b92) - chore: mark version v3.0.0 ([#​5642](https://togithub.com/puppeteer/puppeteer/issues/5642)) [`3387aab`](https://togithub.com/puppeteer/puppeteer/commit/3387aab) - feat(chromium): roll Chromium to r737027 ([#​5644](https://togithub.com/puppeteer/puppeteer/issues/5644)) [`c5df490`](https://togithub.com/puppeteer/puppeteer/commit/c5df490) - docs(readme): update cross-browser FAQ ([#​5634](https://togithub.com/puppeteer/puppeteer/issues/5634)) [`35989a7`](https://togithub.com/puppeteer/puppeteer/commit/35989a7) - fix: set revision based on PUPPETEER_PRODUCT ([#​5643](https://togithub.com/puppeteer/puppeteer/issues/5643)) [`d817ae5`](https://togithub.com/puppeteer/puppeteer/commit/d817ae5) - fix: update preferred revision after Launcher is created ([#​5640](https://togithub.com/puppeteer/puppeteer/issues/5640)) [`df81250`](https://togithub.com/puppeteer/puppeteer/commit/df81250) - chore: update ws library ([#​5638](https://togithub.com/puppeteer/puppeteer/issues/5638)) [`2529ee6`](https://togithub.com/puppeteer/puppeteer/commit/2529ee6) - chore(eslint): add eslint typescript linting ([#​5635](https://togithub.com/puppeteer/puppeteer/issues/5635)) [`88d843d`](https://togithub.com/puppeteer/puppeteer/commit/88d843d) - feat(TypeScript): move DeviceDescriptors to TS ([#​5595](https://togithub.com/puppeteer/puppeteer/issues/5595)) [`1ce4fe7`](https://togithub.com/puppeteer/puppeteer/commit/1ce4fe7) - chore(deps): update extract-zip to version 2 ([#​5610](https://togithub.com/puppeteer/puppeteer/issues/5610)) [`0bcc5a7`](https://togithub.com/puppeteer/puppeteer/commit/0bcc5a7) - chore: migrate remaining tests to Mocha ([#​5616](https://togithub.com/puppeteer/puppeteer/issues/5616)) [`17cd870`](https://togithub.com/puppeteer/puppeteer/commit/17cd870) - chore: migrate unit tests to Mocha ([#​5600](https://togithub.com/puppeteer/puppeteer/issues/5600)) [`262da92`](https://togithub.com/puppeteer/puppeteer/commit/262da92) - chore(test): re-enable Firefox testing on CI ([#​5608](https://togithub.com/puppeteer/puppeteer/issues/5608)) [`83d9d53`](https://togithub.com/puppeteer/puppeteer/commit/83d9d53) - chore: update CI to run Travis + Linux + Chromium ([#​5583](https://togithub.com/puppeteer/puppeteer/issues/5583)) [`21c2d31`](https://togithub.com/puppeteer/puppeteer/commit/21c2d31) - docs(api): update another emulateMediaType example ([#​5607](https://togithub.com/puppeteer/puppeteer/issues/5607)) [`fefa8ca`](https://togithub.com/puppeteer/puppeteer/commit/fefa8ca) - docs(api): update emulateMediaType example ([#​5606](https://togithub.com/puppeteer/puppeteer/issues/5606)) [`bbdaf92`](https://togithub.com/puppeteer/puppeteer/commit/bbdaf92) - docs(README): remove unused badges [`efe561e`](https://togithub.com/puppeteer/puppeteer/commit/efe561e) - chore: fix DocLint method diffing ([#​5594](https://togithub.com/puppeteer/puppeteer/issues/5594)) [`841c2a5`](https://togithub.com/puppeteer/puppeteer/commit/841c2a5) - chore: fix emulateMedia tests ([#​5593](https://togithub.com/puppeteer/puppeteer/issues/5593)) [`8fa034b`](https://togithub.com/puppeteer/puppeteer/commit/8fa034b) - chore: remove flakiness dashboard ([#​5592](https://togithub.com/puppeteer/puppeteer/issues/5592)) [`4ee2c43`](https://togithub.com/puppeteer/puppeteer/commit/4ee2c43) - chore: fix Page.emulateMedia doclint failure ([#​5584](https://togithub.com/puppeteer/puppeteer/issues/5584)) [`a99a3cf`](https://togithub.com/puppeteer/puppeteer/commit/a99a3cf) - chore: skip failing cookie tests in Firefox ([#​5575](https://togithub.com/puppeteer/puppeteer/issues/5575)) [`88446df`](https://togithub.com/puppeteer/puppeteer/commit/88446df) - chore: fix missed `src/` vs `lib/` documentation ([#​5591](https://togithub.com/puppeteer/puppeteer/issues/5591)) [`b3b0dc5`](https://togithub.com/puppeteer/puppeteer/commit/b3b0dc5) - docs: replace invalid device descriptors link ([#​5589](https://togithub.com/puppeteer/puppeteer/issues/5589)) [`99ecdba`](https://togithub.com/puppeteer/puppeteer/commit/99ecdba) - docs: fix simple typo ([#​5585](https://togithub.com/puppeteer/puppeteer/issues/5585)) [`7f7887e`](https://togithub.com/puppeteer/puppeteer/commit/7f7887e) - docs(puppeteer-firefox): add deprecation warning to README ([#​5502](https://togithub.com/puppeteer/puppeteer/issues/5502)) [`6522e4f`](https://togithub.com/puppeteer/puppeteer/commit/6522e4f) - chore: Use expect for assertions ([#​5581](https://togithub.com/puppeteer/puppeteer/issues/5581)) [`4c41421`](https://togithub.com/puppeteer/puppeteer/commit/4c41421) - chore: run Chromium on Node.js 12 on Travis ([#​5582](https://togithub.com/puppeteer/puppeteer/issues/5582)) [`f434684`](https://togithub.com/puppeteer/puppeteer/commit/f434684) - chore: fix link to source files in documentation ([#​5576](https://togithub.com/puppeteer/puppeteer/issues/5576)) [`2b52b86`](https://togithub.com/puppeteer/puppeteer/commit/2b52b86) - chore: remove travis-autodeploy ([#​5580](https://togithub.com/puppeteer/puppeteer/issues/5580)) [`7a2a41f`](https://togithub.com/puppeteer/puppeteer/commit/7a2a41f) - chore: move code to src/ and emit with TypeScript ([#​5568](https://togithub.com/puppeteer/puppeteer/issues/5568)) [`c82b556`](https://togithub.com/puppeteer/puppeteer/commit/c82b556) - docs: connect works with any supported browser ([#​5572](https://togithub.com/puppeteer/puppeteer/issues/5572)) [`d678013`](https://togithub.com/puppeteer/puppeteer/commit/d678013) - chore: upgrade TypeScript to 3.8 ([#​5566](https://togithub.com/puppeteer/puppeteer/issues/5566)) [`3dff24a`](https://togithub.com/puppeteer/puppeteer/commit/3dff24a) - chore: upgrade eslint to v6.8.0 ([#​5563](https://togithub.com/puppeteer/puppeteer/issues/5563)) [`4b0fd8b`](https://togithub.com/puppeteer/puppeteer/commit/4b0fd8b) - chore: upgrade to TypeScript 3.7 ([#​5562](https://togithub.com/puppeteer/puppeteer/issues/5562)) [`29b626a`](https://togithub.com/puppeteer/puppeteer/commit/29b626a) - chore: upgrade TypeScript to 3.6 ([#​5559](https://togithub.com/puppeteer/puppeteer/issues/5559)) [`5e8d79b`](https://togithub.com/puppeteer/puppeteer/commit/5e8d79b) - chore: upgrade to TypeScript 3.5 ([#​5556](https://togithub.com/puppeteer/puppeteer/issues/5556)) [`b9240b1`](https://togithub.com/puppeteer/puppeteer/commit/b9240b1) - chore: bump rimraf to v3.0.2 ([#​5431](https://togithub.com/puppeteer/puppeteer/issues/5431)) [`067662c`](https://togithub.com/puppeteer/puppeteer/commit/067662c) - Emit change event on uploadFile calls ([#​5389](https://togithub.com/puppeteer/puppeteer/issues/5389)) [`a3d1536`](https://togithub.com/puppeteer/puppeteer/commit/a3d1536) - Bugfix: Docker build failure ([#​5400](https://togithub.com/puppeteer/puppeteer/issues/5400)) [`33f1967`](https://togithub.com/puppeteer/puppeteer/commit/33f1967) - (feat) Add option to fetch Firefox Nightly ([#​5467](https://togithub.com/puppeteer/puppeteer/issues/5467)) [`807fbbd`](https://togithub.com/puppeteer/puppeteer/commit/807fbbd) - chore: drop Node.js v8 support ([#​5365](https://togithub.com/puppeteer/puppeteer/issues/5365)) [`0b1a9ce`](https://togithub.com/puppeteer/puppeteer/commit/0b1a9ce) - chore: Replace Juggler with Firefox Nightly in CI ([#​5395](https://togithub.com/puppeteer/puppeteer/issues/5395)) [`0b1777e`](https://togithub.com/puppeteer/puppeteer/commit/0b1777e) - docs(api) Fix url ([#​5367](https://togithub.com/puppeteer/puppeteer/issues/5367)) [`5ffcde2`](https://togithub.com/puppeteer/puppeteer/commit/5ffcde2) - chore: bump version to v2.1.1.-post ([#​5390](https://togithub.com/puppeteer/puppeteer/issues/5390)) [`46386eb`](https://togithub.com/puppeteer/puppeteer/commit/46386eb) - chore: mark version v2.1.1 ([#​5388](https://togithub.com/puppeteer/puppeteer/issues/5388)) [`9923e56`](https://togithub.com/puppeteer/puppeteer/commit/9923e56) - fix(filechooser): quick fix for the headful file chooser ([#​5369](https://togithub.com/puppeteer/puppeteer/issues/5369)) [`1a1ef83`](https://togithub.com/puppeteer/puppeteer/commit/1a1ef83) - Add FAQ entry on cross-browser support ([#​5360](https://togithub.com/puppeteer/puppeteer/issues/5360)) [`0d243b7`](https://togithub.com/puppeteer/puppeteer/commit/0d243b7) - feat: make it possible to run `install.js` script with `puppeteer-core` ([#​5325](https://togithub.com/puppeteer/puppeteer/issues/5325)) [`c283fea`](https://togithub.com/puppeteer/puppeteer/commit/c283fea) - docs(api): add example to page.$$eval ([#​5200](https://togithub.com/puppeteer/puppeteer/issues/5200))
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/nodejs-docs-samples). --- appengine/websockets/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/websockets/package.json b/appengine/websockets/package.json index 43a6d6333e..0365b0eabc 100644 --- a/appengine/websockets/package.json +++ b/appengine/websockets/package.json @@ -28,7 +28,7 @@ "eslint-plugin-node": "^11.0.0", "eslint-plugin-prettier": "^3.0.0", "mocha": "^7.0.0", - "puppeteer": "^2.0.0" + "puppeteer": "^3.0.0" }, "cloud-repo-tools": { "test": { From ad7cd89d82b17fe7b18ad10fa8081d5621b53d52 Mon Sep 17 00:00:00 2001 From: sofisl <55454395+sofisl@users.noreply.github.com> Date: Thu, 16 Apr 2020 15:20:05 -0700 Subject: [PATCH 13/48] chore:refactor memcached test (#1698) --- appengine/memcached/app.js | 4 +++- appengine/memcached/package.json | 6 ++++-- appengine/memcached/test/app.test.js | 13 +++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 appengine/memcached/test/app.test.js diff --git a/appengine/memcached/app.js b/appengine/memcached/app.js index 3ba83e99a5..c8593ee30a 100644 --- a/appengine/memcached/app.js +++ b/appengine/memcached/app.js @@ -43,7 +43,9 @@ app.get('/', async (req, res, next) => { }); const PORT = process.env.PORT || 8080; -app.listen(PORT, () => { +const server = app.listen(PORT, () => { console.log(`App listening on port ${PORT}`); console.log('Press Ctrl+C to quit.'); }); + +module.exports = server; diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index 021dffe7a0..4fc85584d9 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -10,13 +10,15 @@ }, "scripts": { "start": "node app.js", - "test": "repo-tools test app" + "test": "mocha --exit test/*.test.js" }, "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" }, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "^3.3.0" + "chai": "^4.2.0", + "mocha": "^7.1.1", + "wait-port": "^0.2.7" } } diff --git a/appengine/memcached/test/app.test.js b/appengine/memcached/test/app.test.js new file mode 100644 index 0000000000..c2290430a1 --- /dev/null +++ b/appengine/memcached/test/app.test.js @@ -0,0 +1,13 @@ +const waitPort = require('wait-port'); +const {expect} = require('chai'); + +const PORT = process.env.PORT || 8080; + +describe('server listening', () => { + it('should be listening', async () => { + const server = require('../app.js'); + const isOpen = await waitPort({port: PORT}); + expect(isOpen).to.be.true; + server.close(); + }); +}); From 2c26a149e07e126b9a178c5deb103dc64d8d25e0 Mon Sep 17 00:00:00 2001 From: noerog <32459203+noerog@users.noreply.github.com> Date: Thu, 16 Apr 2020 18:28:12 -0400 Subject: [PATCH 14/48] healthcare API: update hl7v2 samples from v1beta1 to v1 (#1721) --- healthcare/hl7v2/createHl7v2Message.js | 2 +- healthcare/hl7v2/createHl7v2Store.js | 2 +- healthcare/hl7v2/deleteHl7v2Message.js | 2 +- healthcare/hl7v2/deleteHl7v2Store.js | 2 +- healthcare/hl7v2/getHl7v2Message.js | 2 +- healthcare/hl7v2/getHl7v2Store.js | 2 +- healthcare/hl7v2/getHl7v2StoreIamPolicy.js | 2 +- healthcare/hl7v2/ingestHl7v2Message.js | 2 +- healthcare/hl7v2/listHl7v2Messages.js | 2 +- healthcare/hl7v2/listHl7v2Stores.js | 2 +- healthcare/hl7v2/package.json | 2 +- healthcare/hl7v2/patchHl7v2Message.js | 2 +- healthcare/hl7v2/patchHl7v2Store.js | 2 +- healthcare/hl7v2/setHl7v2StoreIamPolicy.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/healthcare/hl7v2/createHl7v2Message.js b/healthcare/hl7v2/createHl7v2Message.js index 6281af6902..4a548214f0 100644 --- a/healthcare/hl7v2/createHl7v2Message.js +++ b/healthcare/hl7v2/createHl7v2Message.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_create_hl7v2_message] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const fs = require('fs'); const util = require('util'); const readFile = util.promisify(fs.readFile); diff --git a/healthcare/hl7v2/createHl7v2Store.js b/healthcare/hl7v2/createHl7v2Store.js index 0a9e386916..692c974e94 100644 --- a/healthcare/hl7v2/createHl7v2Store.js +++ b/healthcare/hl7v2/createHl7v2Store.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_create_hl7v2_store] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const createHl7v2Store = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/deleteHl7v2Message.js b/healthcare/hl7v2/deleteHl7v2Message.js index 8065cc276a..9c981afcca 100644 --- a/healthcare/hl7v2/deleteHl7v2Message.js +++ b/healthcare/hl7v2/deleteHl7v2Message.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_delete_hl7v2_message] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const deleteHl7v2Message = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/deleteHl7v2Store.js b/healthcare/hl7v2/deleteHl7v2Store.js index 90db43a309..cf86d4910c 100644 --- a/healthcare/hl7v2/deleteHl7v2Store.js +++ b/healthcare/hl7v2/deleteHl7v2Store.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_delete_hl7v2_store] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const deleteHl7v2Store = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/getHl7v2Message.js b/healthcare/hl7v2/getHl7v2Message.js index 0f371151c5..d77111271c 100644 --- a/healthcare/hl7v2/getHl7v2Message.js +++ b/healthcare/hl7v2/getHl7v2Message.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_get_hl7v2_message] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const getHl7v2Message = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/getHl7v2Store.js b/healthcare/hl7v2/getHl7v2Store.js index b0616036fa..477fd4dcfe 100644 --- a/healthcare/hl7v2/getHl7v2Store.js +++ b/healthcare/hl7v2/getHl7v2Store.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_get_hl7v2_store] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const getHl7v2Store = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/getHl7v2StoreIamPolicy.js b/healthcare/hl7v2/getHl7v2StoreIamPolicy.js index 1dbed760ea..4f6b95ed08 100644 --- a/healthcare/hl7v2/getHl7v2StoreIamPolicy.js +++ b/healthcare/hl7v2/getHl7v2StoreIamPolicy.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_hl7v2_store_get_iam_policy] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const getHl7v2StoreIamPolicy = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/ingestHl7v2Message.js b/healthcare/hl7v2/ingestHl7v2Message.js index ee97bd17d3..f5693e8aee 100644 --- a/healthcare/hl7v2/ingestHl7v2Message.js +++ b/healthcare/hl7v2/ingestHl7v2Message.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_ingest_hl7v2_message] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const fs = require('fs'); const util = require('util'); const readFile = util.promisify(fs.readFile); diff --git a/healthcare/hl7v2/listHl7v2Messages.js b/healthcare/hl7v2/listHl7v2Messages.js index dcb80115d4..a7a8d75d27 100644 --- a/healthcare/hl7v2/listHl7v2Messages.js +++ b/healthcare/hl7v2/listHl7v2Messages.js @@ -24,7 +24,7 @@ const main = ( ) => { // [START healthcare_list_hl7v2_messages] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const listHl7v2Messages = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/listHl7v2Stores.js b/healthcare/hl7v2/listHl7v2Stores.js index b4468ec175..930aaa4666 100644 --- a/healthcare/hl7v2/listHl7v2Stores.js +++ b/healthcare/hl7v2/listHl7v2Stores.js @@ -23,7 +23,7 @@ const main = ( ) => { // [START healthcare_list_hl7v2_stores] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const listHl7v2Stores = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/package.json b/healthcare/hl7v2/package.json index 80b85004b2..a18796e80c 100644 --- a/healthcare/hl7v2/package.json +++ b/healthcare/hl7v2/package.json @@ -16,7 +16,7 @@ "mocha": "^7.0.0" }, "dependencies": { - "googleapis": "^48.0.0", + "googleapis": "^49.0.0", "uuid": "^7.0.0", "yargs": "^15.0.0" }, diff --git a/healthcare/hl7v2/patchHl7v2Message.js b/healthcare/hl7v2/patchHl7v2Message.js index 53baa54820..dbec7b424a 100644 --- a/healthcare/hl7v2/patchHl7v2Message.js +++ b/healthcare/hl7v2/patchHl7v2Message.js @@ -27,7 +27,7 @@ const main = ( ) => { // [START healthcare_patch_hl7v2_message] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const patchHl7v2Message = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/patchHl7v2Store.js b/healthcare/hl7v2/patchHl7v2Store.js index 4faca87964..8b685c87d3 100644 --- a/healthcare/hl7v2/patchHl7v2Store.js +++ b/healthcare/hl7v2/patchHl7v2Store.js @@ -25,7 +25,7 @@ const main = ( ) => { // [START healthcare_patch_hl7v2_store] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const patchHl7v2Store = async () => { const auth = await google.auth.getClient({ diff --git a/healthcare/hl7v2/setHl7v2StoreIamPolicy.js b/healthcare/hl7v2/setHl7v2StoreIamPolicy.js index 827395229f..d4ac5a3619 100644 --- a/healthcare/hl7v2/setHl7v2StoreIamPolicy.js +++ b/healthcare/hl7v2/setHl7v2StoreIamPolicy.js @@ -26,7 +26,7 @@ const main = ( ) => { // [START healthcare_hl7v2_store_set_iam_policy] const {google} = require('googleapis'); - const healthcare = google.healthcare('v1beta1'); + const healthcare = google.healthcare('v1'); const setHl7v2StoreIamPolicy = async () => { const auth = await google.auth.getClient({ From 068b7fcecee9cd9b5a62409f34c69bdbbb159fe7 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 1 Apr 2020 11:53:07 -0700 Subject: [PATCH 15/48] chore: refactor cloudsql_postgresql --- appengine/cloudsql_postgresql/package.json | 6 ++++-- .../test/serverListening.test.js | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 appengine/cloudsql_postgresql/test/serverListening.test.js diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index efe30faf08..b003d860ee 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/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 --timeout=30000", "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 --timeout=30000", "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" @@ -29,6 +29,8 @@ "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" diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js new file mode 100644 index 0000000000..00cff58412 --- /dev/null +++ b/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'); + }); +}); From 3b5bb9516a005aa17c5c0c689d47cc74f7bb9287 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 9 Apr 2020 21:13:00 -0700 Subject: [PATCH 16/48] check: user, password and database env variables --- appengine/cloudsql_postgresql/test/serverListening.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 00cff58412..2f87022b7f 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -10,6 +10,9 @@ describe('server listening', () => { const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; + process.stdout.write(`sql user: ${process.env.SQL_USER}, + password: ${process.env.SQL_PASSWORD}, + database: ${process.env.SQL_DATABASE}`); process.kill(child.pid, 'SIGTERM'); }); }); From 40eb2ddf1b5723bfa64d8bba02f2379f88da5fc7 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 15 Apr 2020 17:35:53 -0700 Subject: [PATCH 17/48] fix: try killing child process --- .../cloudsql_postgresql/test/serverListening.test.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 2f87022b7f..8e3c4945af 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -13,6 +13,13 @@ describe('server listening', () => { process.stdout.write(`sql user: ${process.env.SQL_USER}, password: ${process.env.SQL_PASSWORD}, database: ${process.env.SQL_DATABASE}`); - process.kill(child.pid, 'SIGTERM'); + try { + process.kill(child.pid, 'SIGTERM'); + // eslint-disable-next-line no-empty + } catch (err) {} + try { + child.kill('SIGTERM'); + // eslint-disable-next-line no-empty + } catch (err) {} }); }); From 5989d8884b2a1d8b0aa86ee2eb9503f954b73b20 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 10:09:10 -0700 Subject: [PATCH 18/48] try --- appengine/cloudsql_postgresql/package.json | 2 +- .../test/serverListening.test.js | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index b003d860ee..c2c811f672 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -17,7 +17,7 @@ "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &", "system-test": "mocha test/serverListening.test.js --timeout=30000", "system-test-proxy": "npm run start-proxy; npm run system-test", - "all-test": "npm run unit-test && npm run system-test", + "all-test": "npm run system-test", "test": "npm -- run all-test" }, "dependencies": { diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 8e3c4945af..605ebb1cb4 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -6,20 +6,11 @@ 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.stdout.write(`sql user: ${process.env.SQL_USER}, - password: ${process.env.SQL_PASSWORD}, - database: ${process.env.SQL_DATABASE}`); - try { + it('should be listening', () => { + const child = childProcess.spawn('node', [appPath]).on('exit', () => { + const isOpen = waitPort({port: PORT}); + expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); - // eslint-disable-next-line no-empty - } catch (err) {} - try { - child.kill('SIGTERM'); - // eslint-disable-next-line no-empty - } catch (err) {} + }); }); }); From 02f841c736437524748c2e7ab0ea73f2e6adf4df Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 10:10:42 -0700 Subject: [PATCH 19/48] try --- .../test/serverListening.test.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 605ebb1cb4..2f87022b7f 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -6,11 +6,13 @@ const path = require('path'); const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { - it('should be listening', () => { - const child = childProcess.spawn('node', [appPath]).on('exit', () => { - const isOpen = waitPort({port: PORT}); - expect(isOpen).to.be.true; - process.kill(child.pid, 'SIGTERM'); - }); + it('should be listening', async () => { + const child = childProcess.exec(`node ${appPath}`); + const isOpen = await waitPort({port: PORT}); + expect(isOpen).to.be.true; + process.stdout.write(`sql user: ${process.env.SQL_USER}, + password: ${process.env.SQL_PASSWORD}, + database: ${process.env.SQL_DATABASE}`); + process.kill(child.pid, 'SIGTERM'); }); }); From ba983727d5741de106f8a0d9cb3da39eee812e97 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 11:43:22 -0700 Subject: [PATCH 20/48] try --- appengine/cloudsql_postgresql/package.json | 2 +- appengine/cloudsql_postgresql/server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index c2c811f672..b003d860ee 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -17,7 +17,7 @@ "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &", "system-test": "mocha test/serverListening.test.js --timeout=30000", "system-test-proxy": "npm run start-proxy; npm run system-test", - "all-test": "npm run system-test", + "all-test": "npm run unit-test && npm run system-test", "test": "npm -- run all-test" }, "dependencies": { diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js index ba06e57c4a..48755920d5 100644 --- a/appengine/cloudsql_postgresql/server.js +++ b/appengine/cloudsql_postgresql/server.js @@ -23,7 +23,7 @@ const Knex = require('knex'); const crypto = require('crypto'); const app = express(); -app.enable('trust proxy'); +//app.enable('trust proxy'); const connect = () => { // [START gae_flex_postgres_connect] From 512a427e3710618cf6ccbd43d91e7031eefa1893 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:20:25 -0700 Subject: [PATCH 21/48] try --- appengine/cloudsql_postgresql/package.json | 4 ++-- appengine/cloudsql_postgresql/server.js | 4 +--- appengine/cloudsql_postgresql/test/createTables.test.js | 1 - appengine/cloudsql_postgresql/test/server.test.js | 1 + .../cloudsql_postgresql/test/serverListening.test.js | 9 +++------ 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index b003d860ee..c5066c0d4d 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -13,9 +13,9 @@ "node": ">=8.0.0" }, "scripts": { - "unit-test": "mocha test/createTables.test.js --timeout=30000 && mocha test/server.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": "mocha test/serverListening.test.js --timeout=30000", + "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" diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js index 48755920d5..4c00ba85cc 100644 --- a/appengine/cloudsql_postgresql/server.js +++ b/appengine/cloudsql_postgresql/server.js @@ -23,7 +23,7 @@ const Knex = require('knex'); const crypto = require('crypto'); const app = express(); -//app.enable('trust proxy'); +app.enable('trust proxy'); const connect = () => { // [START gae_flex_postgres_connect] @@ -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') diff --git a/appengine/cloudsql_postgresql/test/createTables.test.js b/appengine/cloudsql_postgresql/test/createTables.test.js index 545e95647a..c61b68683a 100644 --- a/appengine/cloudsql_postgresql/test/createTables.test.js +++ b/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( diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index 9b104dab6c..db82650bbd 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,6 +72,7 @@ const getSample = () => { }; }; + it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 2f87022b7f..375f064089 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -7,12 +7,9 @@ const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { it('should be listening', async () => { - const child = childProcess.exec(`node ${appPath}`); + //const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; - process.stdout.write(`sql user: ${process.env.SQL_USER}, - password: ${process.env.SQL_PASSWORD}, - database: ${process.env.SQL_DATABASE}`); - process.kill(child.pid, 'SIGTERM'); + //process.kill(child.pid, 'SIGTERM'); }); -}); +}); \ No newline at end of file From de47c048926351352d576bea1cfa4b3f45e21900 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:26:03 -0700 Subject: [PATCH 22/48] try --- appengine/cloudsql_postgresql/test/serverListening.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 375f064089..5f4784cba7 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -7,9 +7,9 @@ const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { it('should be listening', async () => { - //const child = childProcess.exec(`node ${appPath}`); + const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; - //process.kill(child.pid, 'SIGTERM'); + process.kill(child.pid, 'SIGTERM'); }); }); \ No newline at end of file From d6718ece439317e56f808d34391069b7f52a98a8 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:30:02 -0700 Subject: [PATCH 23/48] npm: runfix --- appengine/cloudsql/test/createTables.test.js | 1 - appengine/cloudsql_postgresql/test/server.test.js | 1 - appengine/cloudsql_postgresql/test/serverListening.test.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/appengine/cloudsql/test/createTables.test.js b/appengine/cloudsql/test/createTables.test.js index b79ac4bd28..2d7d832ed4 100644 --- a/appengine/cloudsql/test/createTables.test.js +++ b/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`); }; diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index db82650bbd..9b104dab6c 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,7 +72,6 @@ const getSample = () => { }; }; - it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 5f4784cba7..00cff58412 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -12,4 +12,4 @@ describe('server listening', () => { expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); }); -}); \ No newline at end of file +}); From f4b33897d3c6a0cb812d1d82548be502ff12868e Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 14:28:07 -0700 Subject: [PATCH 24/48] fix: remove repo-tools dependency --- appengine/memcached/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index 4fc85584d9..87f67c8068 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -15,10 +15,13 @@ "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" +<<<<<<< HEAD }, "devDependencies": { "chai": "^4.2.0", "mocha": "^7.1.1", "wait-port": "^0.2.7" +======= +>>>>>>> 950a9c87... fix: remove repo-tools dependency } } From 8ce569ed00c1b969b6e8e0b750d9b4ed0f138713 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 14:38:23 -0700 Subject: [PATCH 25/48] fix dependencies --- appengine/cloudsql_postgresql/package.json | 1 - appengine/memcached/package.json | 3 --- 2 files changed, 4 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index c5066c0d4d..c0d1de08ad 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -27,7 +27,6 @@ "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", diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index 87f67c8068..4fc85584d9 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -15,13 +15,10 @@ "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" -<<<<<<< HEAD }, "devDependencies": { "chai": "^4.2.0", "mocha": "^7.1.1", "wait-port": "^0.2.7" -======= ->>>>>>> 950a9c87... fix: remove repo-tools dependency } } From 7c238f18906e662d70e584b3cd6caa574dff0727 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 1 Apr 2020 11:53:07 -0700 Subject: [PATCH 26/48] chore: refactor cloudsql_postgresql --- appengine/cloudsql_postgresql/package.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index c0d1de08ad..996cfef6a4 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -13,9 +13,15 @@ "node": ">=8.0.0" }, "scripts": { +<<<<<<< HEAD "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": "mocha test/serverListening.test.js --exit", +======= + "unit-test": "mocha test/createTables.test.js --timeout=30000 && mocha test/server.test.js --timeout=30000", + "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &", + "system-test": "mocha test/serverListening.test.js --timeout=30000", +>>>>>>> bd9e5dd5... chore: refactor cloudsql_postgresql "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" From 79f0e584a2409c227514e7d14314eec3ef9ee025 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 9 Apr 2020 21:13:00 -0700 Subject: [PATCH 27/48] check: user, password and database env variables --- appengine/cloudsql_postgresql/test/serverListening.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 00cff58412..2f87022b7f 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -10,6 +10,9 @@ describe('server listening', () => { const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; + process.stdout.write(`sql user: ${process.env.SQL_USER}, + password: ${process.env.SQL_PASSWORD}, + database: ${process.env.SQL_DATABASE}`); process.kill(child.pid, 'SIGTERM'); }); }); From 39fcc4c3e613c61e8a2be9d687214e103f3f0e42 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 15 Apr 2020 17:35:53 -0700 Subject: [PATCH 28/48] fix: try killing child process --- .../cloudsql_postgresql/test/serverListening.test.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 2f87022b7f..8e3c4945af 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -13,6 +13,13 @@ describe('server listening', () => { process.stdout.write(`sql user: ${process.env.SQL_USER}, password: ${process.env.SQL_PASSWORD}, database: ${process.env.SQL_DATABASE}`); - process.kill(child.pid, 'SIGTERM'); + try { + process.kill(child.pid, 'SIGTERM'); + // eslint-disable-next-line no-empty + } catch (err) {} + try { + child.kill('SIGTERM'); + // eslint-disable-next-line no-empty + } catch (err) {} }); }); From 3a21368b1e005788b0be47af8161636f826330a9 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 10:09:10 -0700 Subject: [PATCH 29/48] try --- appengine/cloudsql_postgresql/package.json | 2 +- .../test/serverListening.test.js | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index 996cfef6a4..cc26e3c6c7 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -23,7 +23,7 @@ "system-test": "mocha test/serverListening.test.js --timeout=30000", >>>>>>> bd9e5dd5... chore: refactor cloudsql_postgresql "system-test-proxy": "npm run start-proxy; npm run system-test", - "all-test": "npm run unit-test && npm run system-test", + "all-test": "npm run system-test", "test": "npm -- run all-test" }, "dependencies": { diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 8e3c4945af..605ebb1cb4 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -6,20 +6,11 @@ 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.stdout.write(`sql user: ${process.env.SQL_USER}, - password: ${process.env.SQL_PASSWORD}, - database: ${process.env.SQL_DATABASE}`); - try { + it('should be listening', () => { + const child = childProcess.spawn('node', [appPath]).on('exit', () => { + const isOpen = waitPort({port: PORT}); + expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); - // eslint-disable-next-line no-empty - } catch (err) {} - try { - child.kill('SIGTERM'); - // eslint-disable-next-line no-empty - } catch (err) {} + }); }); }); From b34f1b44728dc43d86ae372b3eae40923d89cc6e Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 10:10:42 -0700 Subject: [PATCH 30/48] try --- .../test/serverListening.test.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 605ebb1cb4..2f87022b7f 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -6,11 +6,13 @@ const path = require('path'); const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { - it('should be listening', () => { - const child = childProcess.spawn('node', [appPath]).on('exit', () => { - const isOpen = waitPort({port: PORT}); - expect(isOpen).to.be.true; - process.kill(child.pid, 'SIGTERM'); - }); + it('should be listening', async () => { + const child = childProcess.exec(`node ${appPath}`); + const isOpen = await waitPort({port: PORT}); + expect(isOpen).to.be.true; + process.stdout.write(`sql user: ${process.env.SQL_USER}, + password: ${process.env.SQL_PASSWORD}, + database: ${process.env.SQL_DATABASE}`); + process.kill(child.pid, 'SIGTERM'); }); }); From b4c253185f992ac2e5ff731570402e94802a56db Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 11:43:22 -0700 Subject: [PATCH 31/48] try --- appengine/cloudsql_postgresql/package.json | 2 +- appengine/cloudsql_postgresql/server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index cc26e3c6c7..996cfef6a4 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -23,7 +23,7 @@ "system-test": "mocha test/serverListening.test.js --timeout=30000", >>>>>>> bd9e5dd5... chore: refactor cloudsql_postgresql "system-test-proxy": "npm run start-proxy; npm run system-test", - "all-test": "npm run system-test", + "all-test": "npm run unit-test && npm run system-test", "test": "npm -- run all-test" }, "dependencies": { diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js index 4c00ba85cc..a5ac7bbcec 100644 --- a/appengine/cloudsql_postgresql/server.js +++ b/appengine/cloudsql_postgresql/server.js @@ -23,7 +23,7 @@ const Knex = require('knex'); const crypto = require('crypto'); const app = express(); -app.enable('trust proxy'); +//app.enable('trust proxy'); const connect = () => { // [START gae_flex_postgres_connect] From 12f095f802c91ca2fc090029baec9d7606b5e6b7 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:20:25 -0700 Subject: [PATCH 32/48] try --- appengine/cloudsql_postgresql/package.json | 6 ------ appengine/cloudsql_postgresql/server.js | 2 +- appengine/cloudsql_postgresql/test/server.test.js | 1 + .../cloudsql_postgresql/test/serverListening.test.js | 9 +++------ 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index 996cfef6a4..c0d1de08ad 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -13,15 +13,9 @@ "node": ">=8.0.0" }, "scripts": { -<<<<<<< HEAD "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": "mocha test/serverListening.test.js --exit", -======= - "unit-test": "mocha test/createTables.test.js --timeout=30000 && mocha test/server.test.js --timeout=30000", - "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &", - "system-test": "mocha test/serverListening.test.js --timeout=30000", ->>>>>>> bd9e5dd5... chore: refactor cloudsql_postgresql "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" diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js index a5ac7bbcec..4c00ba85cc 100644 --- a/appengine/cloudsql_postgresql/server.js +++ b/appengine/cloudsql_postgresql/server.js @@ -23,7 +23,7 @@ const Knex = require('knex'); const crypto = require('crypto'); const app = express(); -//app.enable('trust proxy'); +app.enable('trust proxy'); const connect = () => { // [START gae_flex_postgres_connect] diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index 9b104dab6c..db82650bbd 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,6 +72,7 @@ const getSample = () => { }; }; + it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 2f87022b7f..375f064089 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -7,12 +7,9 @@ const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { it('should be listening', async () => { - const child = childProcess.exec(`node ${appPath}`); + //const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; - process.stdout.write(`sql user: ${process.env.SQL_USER}, - password: ${process.env.SQL_PASSWORD}, - database: ${process.env.SQL_DATABASE}`); - process.kill(child.pid, 'SIGTERM'); + //process.kill(child.pid, 'SIGTERM'); }); -}); +}); \ No newline at end of file From 43b6f9ffdfd0fa6c07f4617ce43b3cfdd6cf248d Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:26:03 -0700 Subject: [PATCH 33/48] try --- appengine/cloudsql_postgresql/test/serverListening.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 375f064089..5f4784cba7 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -7,9 +7,9 @@ const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { it('should be listening', async () => { - //const child = childProcess.exec(`node ${appPath}`); + const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; - //process.kill(child.pid, 'SIGTERM'); + process.kill(child.pid, 'SIGTERM'); }); }); \ No newline at end of file From 216f91e1fd6b9f415a1807c68d34282dbee2283c Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:30:02 -0700 Subject: [PATCH 34/48] npm: runfix --- appengine/cloudsql_postgresql/test/server.test.js | 1 - appengine/cloudsql_postgresql/test/serverListening.test.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index db82650bbd..9b104dab6c 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,7 +72,6 @@ const getSample = () => { }; }; - it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 5f4784cba7..00cff58412 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -12,4 +12,4 @@ describe('server listening', () => { expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); }); -}); \ No newline at end of file +}); From 2604116296a579939c8d531b560488287e7330fd Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 14:28:07 -0700 Subject: [PATCH 35/48] fix: remove repo-tools dependency --- appengine/memcached/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index 4fc85584d9..ddf3785ba6 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -15,10 +15,13 @@ "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" +<<<<<<< HEAD }, "devDependencies": { "chai": "^4.2.0", "mocha": "^7.1.1", "wait-port": "^0.2.7" +======= +>>>>>>> 55ea26c2... fix: remove repo-tools dependency } } From 65427cfdb8c1daa4c39a52d01b90e7a09e2c09da Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 14:38:23 -0700 Subject: [PATCH 36/48] fix dependencies --- appengine/memcached/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index ddf3785ba6..4fc85584d9 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -15,13 +15,10 @@ "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" -<<<<<<< HEAD }, "devDependencies": { "chai": "^4.2.0", "mocha": "^7.1.1", "wait-port": "^0.2.7" -======= ->>>>>>> 55ea26c2... fix: remove repo-tools dependency } } From 880132250977fb9d7e4a6f7a4d7d4416d8176805 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 1 Apr 2020 11:53:07 -0700 Subject: [PATCH 37/48] chore: refactor cloudsql_postgresql --- appengine/cloudsql_postgresql/package.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index c0d1de08ad..996cfef6a4 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -13,9 +13,15 @@ "node": ">=8.0.0" }, "scripts": { +<<<<<<< HEAD "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": "mocha test/serverListening.test.js --exit", +======= + "unit-test": "mocha test/createTables.test.js --timeout=30000 && mocha test/server.test.js --timeout=30000", + "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &", + "system-test": "mocha test/serverListening.test.js --timeout=30000", +>>>>>>> bd9e5dd5... chore: refactor cloudsql_postgresql "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" From 38370273e6f51f467d632172721738d1ace082e3 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 9 Apr 2020 21:13:00 -0700 Subject: [PATCH 38/48] check: user, password and database env variables --- appengine/cloudsql_postgresql/test/serverListening.test.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 00cff58412..2f87022b7f 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -10,6 +10,9 @@ describe('server listening', () => { const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; + process.stdout.write(`sql user: ${process.env.SQL_USER}, + password: ${process.env.SQL_PASSWORD}, + database: ${process.env.SQL_DATABASE}`); process.kill(child.pid, 'SIGTERM'); }); }); From 5385fe3c835f86da20fef3a92d67a143256bca1b Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 15 Apr 2020 17:35:53 -0700 Subject: [PATCH 39/48] fix: try killing child process --- .../cloudsql_postgresql/test/serverListening.test.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 2f87022b7f..8e3c4945af 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -13,6 +13,13 @@ describe('server listening', () => { process.stdout.write(`sql user: ${process.env.SQL_USER}, password: ${process.env.SQL_PASSWORD}, database: ${process.env.SQL_DATABASE}`); - process.kill(child.pid, 'SIGTERM'); + try { + process.kill(child.pid, 'SIGTERM'); + // eslint-disable-next-line no-empty + } catch (err) {} + try { + child.kill('SIGTERM'); + // eslint-disable-next-line no-empty + } catch (err) {} }); }); From e5994680e8cc7ecd5c9b2d14307fbc2d093a47fd Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 10:09:10 -0700 Subject: [PATCH 40/48] try --- appengine/cloudsql_postgresql/package.json | 2 +- .../test/serverListening.test.js | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index 996cfef6a4..cc26e3c6c7 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -23,7 +23,7 @@ "system-test": "mocha test/serverListening.test.js --timeout=30000", >>>>>>> bd9e5dd5... chore: refactor cloudsql_postgresql "system-test-proxy": "npm run start-proxy; npm run system-test", - "all-test": "npm run unit-test && npm run system-test", + "all-test": "npm run system-test", "test": "npm -- run all-test" }, "dependencies": { diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 8e3c4945af..605ebb1cb4 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -6,20 +6,11 @@ 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.stdout.write(`sql user: ${process.env.SQL_USER}, - password: ${process.env.SQL_PASSWORD}, - database: ${process.env.SQL_DATABASE}`); - try { + it('should be listening', () => { + const child = childProcess.spawn('node', [appPath]).on('exit', () => { + const isOpen = waitPort({port: PORT}); + expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); - // eslint-disable-next-line no-empty - } catch (err) {} - try { - child.kill('SIGTERM'); - // eslint-disable-next-line no-empty - } catch (err) {} + }); }); }); From 77232526ec8602132f4704de61ac284f025b94dd Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 10:10:42 -0700 Subject: [PATCH 41/48] try --- .../test/serverListening.test.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 605ebb1cb4..2f87022b7f 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -6,11 +6,13 @@ const path = require('path'); const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { - it('should be listening', () => { - const child = childProcess.spawn('node', [appPath]).on('exit', () => { - const isOpen = waitPort({port: PORT}); - expect(isOpen).to.be.true; - process.kill(child.pid, 'SIGTERM'); - }); + it('should be listening', async () => { + const child = childProcess.exec(`node ${appPath}`); + const isOpen = await waitPort({port: PORT}); + expect(isOpen).to.be.true; + process.stdout.write(`sql user: ${process.env.SQL_USER}, + password: ${process.env.SQL_PASSWORD}, + database: ${process.env.SQL_DATABASE}`); + process.kill(child.pid, 'SIGTERM'); }); }); From 89673dc1a16915623827033b04844571c514129e Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 11:43:22 -0700 Subject: [PATCH 42/48] try --- appengine/cloudsql_postgresql/package.json | 2 +- appengine/cloudsql_postgresql/server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index cc26e3c6c7..996cfef6a4 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -23,7 +23,7 @@ "system-test": "mocha test/serverListening.test.js --timeout=30000", >>>>>>> bd9e5dd5... chore: refactor cloudsql_postgresql "system-test-proxy": "npm run start-proxy; npm run system-test", - "all-test": "npm run system-test", + "all-test": "npm run unit-test && npm run system-test", "test": "npm -- run all-test" }, "dependencies": { diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js index 4c00ba85cc..a5ac7bbcec 100644 --- a/appengine/cloudsql_postgresql/server.js +++ b/appengine/cloudsql_postgresql/server.js @@ -23,7 +23,7 @@ const Knex = require('knex'); const crypto = require('crypto'); const app = express(); -app.enable('trust proxy'); +//app.enable('trust proxy'); const connect = () => { // [START gae_flex_postgres_connect] From 3831f7ccc7eaa0b085bd1ebdf7cd141c3ed72b8c Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:20:25 -0700 Subject: [PATCH 43/48] try --- appengine/cloudsql_postgresql/package.json | 6 ------ appengine/cloudsql_postgresql/server.js | 2 +- appengine/cloudsql_postgresql/test/server.test.js | 1 + .../cloudsql_postgresql/test/serverListening.test.js | 9 +++------ 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/appengine/cloudsql_postgresql/package.json b/appengine/cloudsql_postgresql/package.json index 996cfef6a4..c0d1de08ad 100644 --- a/appengine/cloudsql_postgresql/package.json +++ b/appengine/cloudsql_postgresql/package.json @@ -13,15 +13,9 @@ "node": ">=8.0.0" }, "scripts": { -<<<<<<< HEAD "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": "mocha test/serverListening.test.js --exit", -======= - "unit-test": "mocha test/createTables.test.js --timeout=30000 && mocha test/server.test.js --timeout=30000", - "start-proxy": "! pgrep cloud_sql_proxy > /dev/null && cloud_sql_proxy -instances=$INSTANCE_CONNECTION_NAME=tcp:$SQL_PORT &", - "system-test": "mocha test/serverListening.test.js --timeout=30000", ->>>>>>> bd9e5dd5... chore: refactor cloudsql_postgresql "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" diff --git a/appengine/cloudsql_postgresql/server.js b/appengine/cloudsql_postgresql/server.js index a5ac7bbcec..4c00ba85cc 100644 --- a/appengine/cloudsql_postgresql/server.js +++ b/appengine/cloudsql_postgresql/server.js @@ -23,7 +23,7 @@ const Knex = require('knex'); const crypto = require('crypto'); const app = express(); -//app.enable('trust proxy'); +app.enable('trust proxy'); const connect = () => { // [START gae_flex_postgres_connect] diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index 9b104dab6c..db82650bbd 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,6 +72,7 @@ const getSample = () => { }; }; + it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 2f87022b7f..375f064089 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -7,12 +7,9 @@ const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { it('should be listening', async () => { - const child = childProcess.exec(`node ${appPath}`); + //const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; - process.stdout.write(`sql user: ${process.env.SQL_USER}, - password: ${process.env.SQL_PASSWORD}, - database: ${process.env.SQL_DATABASE}`); - process.kill(child.pid, 'SIGTERM'); + //process.kill(child.pid, 'SIGTERM'); }); -}); +}); \ No newline at end of file From b5048d1d14f30ac8c416ee60c4f4fb43aa03d4f9 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:30:02 -0700 Subject: [PATCH 44/48] npm: runfix --- appengine/cloudsql_postgresql/test/server.test.js | 1 - appengine/cloudsql_postgresql/test/serverListening.test.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index db82650bbd..9b104dab6c 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,7 +72,6 @@ const getSample = () => { }; }; - it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 5f4784cba7..00cff58412 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -12,4 +12,4 @@ describe('server listening', () => { expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); }); -}); \ No newline at end of file +}); From 9bc49522cb43a8c054952f9f9ee6bbcc8e5b7c16 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 13:26:03 -0700 Subject: [PATCH 45/48] try --- appengine/cloudsql_postgresql/test/serverListening.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 375f064089..5f4784cba7 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -7,9 +7,9 @@ const appPath = path.join(__dirname, '../server.js'); describe('server listening', () => { it('should be listening', async () => { - //const child = childProcess.exec(`node ${appPath}`); + const child = childProcess.exec(`node ${appPath}`); const isOpen = await waitPort({port: PORT}); expect(isOpen).to.be.true; - //process.kill(child.pid, 'SIGTERM'); + process.kill(child.pid, 'SIGTERM'); }); }); \ No newline at end of file From 65e5f76876c2233994625cbe120df348ff3fabce Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 14:28:07 -0700 Subject: [PATCH 46/48] fix: remove repo-tools dependency --- appengine/memcached/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index 4fc85584d9..ddf3785ba6 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -15,10 +15,13 @@ "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" +<<<<<<< HEAD }, "devDependencies": { "chai": "^4.2.0", "mocha": "^7.1.1", "wait-port": "^0.2.7" +======= +>>>>>>> 55ea26c2... fix: remove repo-tools dependency } } From f53a2f251579fb09d6979928f20a33344d518ffa Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 14:38:23 -0700 Subject: [PATCH 47/48] fix dependencies --- appengine/memcached/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/appengine/memcached/package.json b/appengine/memcached/package.json index ddf3785ba6..4fc85584d9 100644 --- a/appengine/memcached/package.json +++ b/appengine/memcached/package.json @@ -15,13 +15,10 @@ "dependencies": { "express": "^4.16.4", "memjs": "^1.2.0" -<<<<<<< HEAD }, "devDependencies": { "chai": "^4.2.0", "mocha": "^7.1.1", "wait-port": "^0.2.7" -======= ->>>>>>> 55ea26c2... fix: remove repo-tools dependency } } From a67c113abe9dfd44804f3a962a8cbc428569773e Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 16 Apr 2020 16:10:52 -0700 Subject: [PATCH 48/48] fix: rebase --- appengine/cloudsql_postgresql/test/server.test.js | 1 - appengine/cloudsql_postgresql/test/serverListening.test.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/appengine/cloudsql_postgresql/test/server.test.js b/appengine/cloudsql_postgresql/test/server.test.js index db82650bbd..9b104dab6c 100644 --- a/appengine/cloudsql_postgresql/test/server.test.js +++ b/appengine/cloudsql_postgresql/test/server.test.js @@ -72,7 +72,6 @@ const getSample = () => { }; }; - it('gae_flex_postgres_connect should set up sample in Postgres', () => { const sample = getSample(); diff --git a/appengine/cloudsql_postgresql/test/serverListening.test.js b/appengine/cloudsql_postgresql/test/serverListening.test.js index 5f4784cba7..00cff58412 100644 --- a/appengine/cloudsql_postgresql/test/serverListening.test.js +++ b/appengine/cloudsql_postgresql/test/serverListening.test.js @@ -12,4 +12,4 @@ describe('server listening', () => { expect(isOpen).to.be.true; process.kill(child.pid, 'SIGTERM'); }); -}); \ No newline at end of file +});