From d4ac9b40247f4eaeb4596eb8f9713a73b8ce7c48 Mon Sep 17 00:00:00 2001
From: Brian Carlson <brian.m.carlson@gmail.com>
Date: Thu, 2 Dec 2010 17:48:39 -0600
Subject: [PATCH] make 'assert.calls' short circuit on function call

---
 test/test-helper.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/test-helper.js b/test/test-helper.js
index 1ac91bd8..209fc0e8 100644
--- a/test/test-helper.js
+++ b/test/test-helper.js
@@ -84,12 +84,13 @@ assert.length = function(actual, expectedLength) {
 
 var expect = function(callback) {
   var executed = false;
-  setTimeout(function() {
+  var id = setTimeout(function() {
     assert.ok(executed, "Expected execution never fired");
   }, 1000)
 
   return function(err, queryResult) {
-    executed = true;
+    clearTimeout(id);
+    assert.ok(true);
     callback.apply(this, arguments)
   }
 }