Merge branch 'master' into withTeeny

googleapis · Sep 12, 2018 · 05e95be · 05e95be
2 parents db21a5b + b4583e2
commit 05e95be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/index.ts b/scripts/index.ts
@@ -114,7 +114,7 @@ async function run(steps: string[]) {
           });
           break;
         case 'run-system-tests':
-          if (CIRCLE_PR_NUMBER || !(await existsP(`${projectID}-${keyID}.json`))) {
+          if (CIRCLE_PR_NUMBER) {
             console.log('> Not running system tests in PRs');
           } else {
             await spawnP(

diff --git a/test/plugins/test-trace-http2.ts b/test/plugins/test-trace-http2.ts
@@ -245,7 +245,7 @@ describe('test-trace-http2', () => {
           assert.strictEqual(
               span.labels[TraceLabels.ERROR_DETAILS_NAME],
               'Error [ERR_HTTP2_STREAM_ERROR]');
-          if (semver.satisfies(process.version, '>=9.11')) {
+          if (semver.satisfies(process.version, '>=9.11 || >=8.12')) {
             assert.strictEqual(
                 span.labels[TraceLabels.ERROR_DETAILS_MESSAGE],
                 'Stream closed with error code NGHTTP2_INTERNAL_ERROR');