Get e2e tests on travis

googleapis · Jun 12, 2016 · 4d2dfff · 4d2dfff
1 parent 1e08348
commit 4d2dfff
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/bin/run-e2e.sh b/bin/run-e2e.sh
@@ -5,18 +5,17 @@ set -e
 cd test/e2e
 
 if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
-  openssl aes-256-cbc -K $encrypted_a8f6bb4bf8ae_key \
-    -iv $encrypted_a8f6bb4bf8ae_iv \
-    -in ../../node-team-debug-test-a03aecc1d97a.json.enc \
-    -out node-team-debug-test-a03aecc1d97a.json -d
-  export GOOGLE_APPLICATION_CREDENTIALS=node-team-debug-test-a03aecc1d97a.json
+  openssl aes-256-cbc -K $encrypted_e9782ba88cb0_key \
+    -iv $encrypted_e9782ba88cb0_iv \
+    -in ../../node-team-debug-test-dfc747dacb5b.json.enc \
+    -out ../../node-team-debug-test-dfc747dacb5b.json -d
 fi
 
 echo -en "travis_fold:start:npm_install_test_e2e\\r" | tr / _
 echo "npm install in test/e2e"
 npm install
 echo -en "travis_fold:end:npm_install_test_e2e\\r" | tr / _
 
-node test.js
+node test.js || exit 1
 
 cd -
diff --git a/bin/run-test.sh b/bin/run-test.sh
@@ -42,3 +42,8 @@ if [ "$cover" ]; then
   ./node_modules/coveralls/bin/coveralls.js < ./coverage/lcov.info
   rm -rf ./coverage
 fi
+
+if [ "${TRAVIS_PULL_REQUEST}" = "false" ]
+then
+  ./bin/run-e2e.sh || exit 1
+fi
diff --git a/node-team-debug-test-a03aecc1d97a.json.enc b/node-team-debug-test-a03aecc1d97a.json.enc
diff --git a/node-team-debug-test-dfc747dacb5b.json.enc b/node-team-debug-test-dfc747dacb5b.json.enc