Merge pull request #150 from stephenplusplus/test-pubsub

tests: pubsub: fix racy tests.
googleapis · Aug 29, 2014 · 797c6f6 · 797c6f6
2 parents 7e7c41f + 9e69d98
commit 797c6f6
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/test/pubsub/index.js b/test/pubsub/index.js
@@ -49,17 +49,18 @@ describe('Subscription', function() {
       projectId: 'test-project'
     });
     conn.makeReq = function(method, path, qs, body, callback) {
-      switch (path) {
-        case 'subscriptions//subscriptions/test-project/sub1':
-          callback(null, {});
-          return;
-        case 'subscriptions/pull':
-          callback(null, { ackId: 123 });
-          return;
+      if (path === 'subscriptions//subscriptions/test-project/sub1') {
+        callback(null, {});
+        return;
+      }
+      if (path === 'subscriptions/pull') {
+        callback(null, { ackId: 123 });
+        return;
       }
     };
     var sub = conn.subscribe('sub1', { autoAck: false });
-    sub.on('message', function() {
+    sub.once('message', function() {
+      sub.close();
       done();
     });
   });
@@ -69,22 +70,24 @@ describe('Subscription', function() {
       projectId: 'test-project'
     });
     conn.makeReq = function(method, path, qs, body, callback) {
-      switch (path) {
-        case 'subscriptions//subscriptions/test-project/sub1':
-          callback(null, {});
-          return;
-        case 'subscriptions/pull':
-          setImmediate(function() {
-            callback(null, { ackId: 123 });
-          });
-          return;
-        case 'subscriptions/acknowledge':
-          callback(null, true);
-          return;
+      if (path === 'subscriptions//subscriptions/test-project/sub1') {
+        callback(null, {});
+        return;
+      }
+      if (path === 'subscriptions/pull') {
+        setImmediate(function() {
+          callback(null, { ackId: 123 });
+        });
+        return;
+      }
+      if (path === 'subscriptions/acknowledge') {
+        callback(null, true);
+        return;
       }
     };
     var sub = conn.subscribe('sub1', { autoAck: true });
-    sub.on('message', function() {
+    sub.once('message', function() {
+      sub.close();
       done();
     });
   });