Address comments

Author: minggangw

lib/wait_for_message.js

@@ -14,6 +14,8 @@
 
 'use strict';
 
+const { TimeoutError } = require('./errors.js');
+
 /**
  * Wait for a single message on a topic.
  *
@@ -56,7 +58,7 @@ function waitForMessage(typeClass, node, topic, options = {}) {
       if (subscription) {
         try {
           node.destroySubscription(subscription);
-        } catch (e) {
+        } catch {
           // Subscription may already be destroyed if node is shutting down
         }
         subscription = null;
@@ -92,8 +94,9 @@ function waitForMessage(typeClass, node, topic, options = {}) {
       if (options.timeout != null && options.timeout >= 0) {
         timer = setTimeout(() => {
           settle(
-            new Error(
-              `waitForMessage timed out after ${options.timeout}ms on topic '${topic}'`
+            new TimeoutError(
+              `waitForMessage timed out after ${options.timeout}ms on topic '${topic}'`,
+              { entityType: 'topic', entityName: topic }
             )
           );
         }, options.timeout);

test/test-wait-for-message.js

@@ -70,7 +70,10 @@ describe('waitForMessage tests', function () {
           'wfm_nonexistent_topic',
           { timeout: 500 }
         ),
-      { message: /timed out/ }
+      (error) => {
+        assert.strictEqual(error.name, 'TimeoutError');
+        return true;
+      }
     );
   });
 
@@ -80,8 +83,6 @@ describe('waitForMessage tests', function () {
       'wfm_test_topic_2'
     );
 
-    let receiveCount = 0;
-
     setTimeout(() => {
       publisher.publish('first');
       publisher.publish('second');