revert some failing test

Author: jimmywarting

lib/channel_model.js

@@ -158,16 +158,17 @@ class Channel extends BaseChannel {
     return this.publish('', queue, content, options);
   }
 
-  async consume(queue, callback, options) {
+  consume(queue, callback, options) {
     // NB we want the callback to be run synchronously, so that we've
     // registered the consumerTag before any messages can arrive.
     const fields = Args.consume(queue, options);
-    const ok = await Promise.fromCallback(cb => {
+    return Promise.fromCallback(cb => {
       this._rpc(defs.BasicConsume, fields, defs.BasicConsumeOk, cb);
     })
-
-    this.registerConsumer(ok.fields.consumerTag, callback);
-    return ok.fields;
+    .then(ok => {
+      this.registerConsumer(ok.fields.consumerTag, callback);
+      return ok.fields;
+    });
   }
 
   async cancel(consumerTag) {
@@ -176,32 +177,34 @@ class Channel extends BaseChannel {
             defs.BasicCancelOk,
             cb);
     })
-
-    this.unregisterConsumer(consumerTag);
-    return ok.fields;
+    .then(ok => {
+      this.unregisterConsumer(consumerTag);
+      return ok.fields;
+    });
   }
 
-  async get(queue, options) {
+  get(queue, options) {
     const fields = Args.get(queue, options);
-    const f = await Promise.fromCallback(cb => {
-      this.sendOrEnqueue(defs.BasicGet, fields, cb);
+    return Promise.fromCallback(cb => {
+      return this.sendOrEnqueue(defs.BasicGet, fields, cb);
     })
-
-    if (f.id === defs.BasicGetEmpty) {
-      return false;
-    }
-    else if (f.id === defs.BasicGetOk) {
-      const fields = f.fields;
-      return new Promise(resolve => {
-        this.handleMessage = acceptMessage(m => {
-          m.fields = fields;
-          resolve(m);
+    .then(f => {
+      if (f.id === defs.BasicGetEmpty) {
+        return false;
+      }
+      else if (f.id === defs.BasicGetOk) {
+        const fields = f.fields;
+        return new Promise(resolve => {
+          this.handleMessage = acceptMessage(m => {
+            m.fields = fields;
+            resolve(m);
+          });
         });
-      });
-    }
-    else {
-      throw new Error(`Unexpected response to BasicGet: ${inspect(f)}`);
-    }
+      }
+      else {
+        throw new Error(`Unexpected response to BasicGet: ${inspect(f)}`);
+      }
+    });
   }
 
   ack(message, allUpTo) {