fix: fix flaky schema and subscription tests (#1518)

feywind · web-flow · commit 5ff0105cf847 · 2022-04-19T13:25:29.000-04:00
* tests: make another attempt and cleaning up the schema test flakiness

* tests: rework subscription tests to try to fix flakiness

* samples: allow subscription IDs in sync pull samples
diff --git a/samples/synchronousPull.js b/samples/synchronousPull.js
@@ -36,7 +36,7 @@ function main(
    * TODO(developer): Uncomment these variables before running the sample.
    */
   // const projectId = 'YOUR_PROJECT_ID';
-  // const subscriptionName = 'YOUR_SUBSCRIPTION_NAME';
+  // const subscriptionNameOrId = 'YOUR_SUBSCRIPTION_NAME_OR_ID';
 
   // Imports the Google Cloud client library. v1 is for the lower level
   // proto access.
@@ -46,10 +46,11 @@ function main(
   const subClient = new v1.SubscriberClient();
 
   async function synchronousPull() {
-    const formattedSubscription = subClient.subscriptionPath(
-      projectId,
-      subscriptionNameOrId
-    );
+    // The low level API client requires a name only.
+    const formattedSubscription =
+      subscriptionNameOrId.indexOf('/') >= 0
+        ? subscriptionNameOrId
+        : subClient.subscriptionPath(projectId, subscriptionNameOrId);
 
     // The maximum number of messages returned for this request.
     // Pub/Sub may return fewer than the number specified.
diff --git a/samples/synchronousPullWithDeliveryAttempts.js b/samples/synchronousPullWithDeliveryAttempts.js
@@ -46,10 +46,11 @@ function main(
   const subClient = new v1.SubscriberClient();
 
   async function synchronousPullWithDeliveryAttempts() {
-    const formattedSubscription = subClient.subscriptionPath(
-      projectId,
-      subscriptionNameOrId
-    );
+    // The low level API client requires a name only.
+    const formattedSubscription =
+      subscriptionNameOrId.indexOf('/') >= 0
+        ? subscriptionNameOrId
+        : subClient.subscriptionPath(projectId, subscriptionNameOrId);
 
     // The maximum number of messages returned for this request.
     // Pub/Sub may return fewer than the number specified.
diff --git a/samples/synchronousPullWithLeaseManagement.js b/samples/synchronousPullWithLeaseManagement.js
@@ -46,10 +46,11 @@ function main(
   const subClient = new v1.SubscriberClient();
 
   async function synchronousPullWithLeaseManagement() {
-    const formattedSubscription = subClient.subscriptionPath(
-      projectId,
-      subscriptionNameOrId
-    );
+    // The low level API client requires a name only.
+    const formattedSubscription =
+      subscriptionNameOrId.indexOf('/') >= 0
+        ? subscriptionNameOrId
+        : subClient.subscriptionPath(projectId, subscriptionNameOrId);
 
     // The maximum number of messages returned for this request.
     // Pub/Sub may return fewer than the number specified.
diff --git a/samples/system-test/schema.test.ts b/samples/system-test/schema.test.ts
@@ -23,7 +23,7 @@ import {
   Topic,
 } from '@google-cloud/pubsub';
 import {assert} from 'chai';
-import {describe, it, after} from 'mocha';
+import {describe, it, afterEach} from 'mocha';
 import * as cp from 'child_process';
 import * as uuid from 'uuid';
 import * as path from 'path';
@@ -39,7 +39,7 @@ describe('schema', () => {
   const projectId = process.env.GCLOUD_PROJECT;
   const pubsub = new PubSub({projectId});
   const runId = uuid.v4();
-  console.log(`Topics runId: ${runId}`);
+  console.log(`Schema runId: ${runId}`);
   const topicIdStem = `schema-top-${runId}-`;
   const subscriptionIdStem = `schema-sub-${runId}-`;
   const schemaIdStem = `schema-${runId}-`;
@@ -90,7 +90,7 @@ describe('schema', () => {
     );
   }
 
-  after(async () => {
+  afterEach(async () => {
     await cleanAllSubs();
     await cleanAllTopics();
     await cleanAllSchemas();
diff --git a/samples/system-test/subscriptions.test.ts b/samples/system-test/subscriptions.test.ts
