From a0fa9acb50e8dfb8811063bc7093cc8b70e2474f Mon Sep 17 00:00:00 2001 From: Ace Nassri Date: Mon, 9 Jul 2018 16:41:35 -0700 Subject: [PATCH 1/2] Fix failing tests, take 1 --- .kokoro/appengine/cloudsql-postgresql.cfg | 7 ------- .kokoro/appengine/pubsub.cfg | 14 +++++++++++++- .kokoro/cloudtasks.cfg | 8 +++++++- appengine/cloudsql/package.json | 5 +++-- containerengine/hello-world/package.json | 7 ++++--- endpoints/getting-started/package.json | 1 + language/slackbot/package.json | 3 ++- 7 files changed, 30 insertions(+), 15 deletions(-) delete mode 100644 .kokoro/appengine/cloudsql-postgresql.cfg diff --git a/.kokoro/appengine/cloudsql-postgresql.cfg b/.kokoro/appengine/cloudsql-postgresql.cfg deleted file mode 100644 index ba61e2b236..0000000000 --- a/.kokoro/appengine/cloudsql-postgresql.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Set the folder in which the tests are run -env_vars: { - key: "PROJECT" - value: "appengine/cloudsql-postgresql" -} diff --git a/.kokoro/appengine/pubsub.cfg b/.kokoro/appengine/pubsub.cfg index aab232d9e3..73e45664e0 100644 --- a/.kokoro/appengine/pubsub.cfg +++ b/.kokoro/appengine/pubsub.cfg @@ -10,4 +10,16 @@ env_vars: { env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-docs-samples/.kokoro/build.sh" -} +} + +# Set the Pub/Sub topic to use +env_vars: { + key: "PUBSUB_TOPIC" + value: "integration-tests-instance" +} + +# Set the Pub/Sub verification token to use +env_vars: { + key: "PUBSUB_VERIFICATION_TOKEN" + value: "123456abcdef" +} diff --git a/.kokoro/cloudtasks.cfg b/.kokoro/cloudtasks.cfg index 13fe1d94e4..bfcdd3b554 100644 --- a/.kokoro/cloudtasks.cfg +++ b/.kokoro/cloudtasks.cfg @@ -10,4 +10,10 @@ env_vars: { env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-docs-samples/.kokoro/build.sh" -} +} + +# Set the task queue to use +env_vars: { + key: "GCP_QUEUE" + value: "nodejs-test-queue-do-not-delete" +} \ No newline at end of file diff --git a/appengine/cloudsql/package.json b/appengine/cloudsql/package.json index f37f65a1a4..3211cbf234 100644 --- a/appengine/cloudsql/package.json +++ b/appengine/cloudsql/package.json @@ -30,8 +30,9 @@ "prompt": "1.0.0" }, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "2.2.5", - "ava": "0.25.0" + "@google-cloud/nodejs-repo-tools": "2.3.0", + "ava": "0.25.0", + "semistandard": "^12.0.1" }, "cloud-repo-tools": { "requiresKeyFile": true, diff --git a/containerengine/hello-world/package.json b/containerengine/hello-world/package.json index 458147dbb5..949e79418f 100644 --- a/containerengine/hello-world/package.json +++ b/containerengine/hello-world/package.json @@ -14,14 +14,15 @@ }, "scripts": { "start": "node server.js", - "lint": "samples lint", + "lint": "repo-tools lint", "pretest": "npm run lint", - "system-test": "samples test app", + "system-test": "repo-tools test app", "test": "npm run system-test" }, "dependencies": {}, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "1.4.17" + "@google-cloud/nodejs-repo-tools": "^2.3.0", + "semistandard": "^12.0.1" }, "cloud-repo-tools": { "test": { diff --git a/endpoints/getting-started/package.json b/endpoints/getting-started/package.json index dec0063804..6080c246ec 100644 --- a/endpoints/getting-started/package.json +++ b/endpoints/getting-started/package.json @@ -27,6 +27,7 @@ "@google-cloud/nodejs-repo-tools": "^2.3.0", "ava": "0.25.0", "proxyquire": "2.0.0", + "semistandard": "^12.0.1", "sinon": "4.4.2", "supertest": "3.0.0" } diff --git a/language/slackbot/package.json b/language/slackbot/package.json index 75c71a8b39..698324947e 100644 --- a/language/slackbot/package.json +++ b/language/slackbot/package.json @@ -28,9 +28,10 @@ "sqlite3": "3.1.9" }, "devDependencies": { - "@google-cloud/nodejs-repo-tools": "1.4.17", + "@google-cloud/nodejs-repo-tools": "2.3.0", "ava": "0.21.0", "proxyquire": "1.8.0", + "semistandard": "^12.0.1", "sinon": "3.2.0" } } From 95c46f6ba0622edc8a8cd629de396ab7fa753150 Mon Sep 17 00:00:00 2001 From: Ace Nassri Date: Mon, 9 Jul 2018 17:33:45 -0700 Subject: [PATCH 2/2] Take 2 --- containerengine/hello-world/package.json | 2 +- language/slackbot/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containerengine/hello-world/package.json b/containerengine/hello-world/package.json index 949e79418f..1ce582ae70 100644 --- a/containerengine/hello-world/package.json +++ b/containerengine/hello-world/package.json @@ -16,7 +16,7 @@ "start": "node server.js", "lint": "repo-tools lint", "pretest": "npm run lint", - "system-test": "repo-tools test app", + "system-test": "repo-tools test app -- server.js", "test": "npm run system-test" }, "dependencies": {}, diff --git a/language/slackbot/package.json b/language/slackbot/package.json index 698324947e..3bf2a477a1 100644 --- a/language/slackbot/package.json +++ b/language/slackbot/package.json @@ -18,9 +18,9 @@ "node": ">=4.3.2" }, "scripts": { - "lint": "samples lint", + "lint": "repo-tools lint", "pretest": "npm run lint", - "test": "samples test run --cmd ava -- -T 20s --verbose system-test/*.test.js" + "test": "repo-tools test run --cmd ava -- -T 20s --verbose system-test/*.test.js" }, "dependencies": { "@google-cloud/language": "0.11.0",