call callback of close even if server.close throws error

busterjs · Mar 13, 2015 · 7c0e69b · 7c0e69b
1 parent 14171e7
commit 7c0e69b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/agent.js b/lib/agent.js
@@ -193,7 +193,11 @@ Agent.prototype = {
                 this._bayeux.close();
             }
             if (this._server) {
-                this._server.close(cb);
+                try {
+                    this._server.close(cb);
+                } catch (e) {
+                    cb();
+                }
             }
         }.bind(this));
     }

diff --git a/test/agent-test.js b/test/agent-test.js
@@ -472,5 +472,17 @@ buster.testCase("buster-ci-agent", {
             cb3();
             assert.calledOnce(callback);
         }
-    }
+    },
+
+    "calls callback of close even if server.close throws":
+        function () {
+
+            this.server.close.throws(new Error("Not running"));
+            this.agent = new Agent({});
+            var callback = this.stub();
+
+            this.agent.close(callback);
+
+            assert.calledOnce(callback);
+        }
 });