use a createStream() function instead of .stream

Author: James Halliday

index.js

@@ -16,9 +16,10 @@ var nextTick = typeof setImmediate !== 'undefined'
 
 exports = module.exports = (function () {
     var harness = createHarness();
-    harness.stream.pipe(createDefaultStream());
+    harness.createStream().pipe(createDefaultStream());
     return harness;
 })();
+
 exports.createHarness = createHarness;
 exports.Test = Test;
 exports.test = exports; // tap compat
@@ -27,9 +28,14 @@ var exitInterval;
 
 function createHarness (conf_) {
     var exitCode = 0;
-    var results = createResultStream();
+    var results;
 
     var test = function (name, conf, cb) {
+        if (!results) {
+            results = createResultStream();
+            results.pause();
+        }
+        
         var t = new Test(name, conf, cb);
         (function inspectCode (st) {
             st.on('test', function sub (st_) {
@@ -43,6 +49,12 @@ function createHarness (conf_) {
         results.push(t);
         return t;
     };
-    test.stream = results;
+    
+    test.createStream = function () {
+        if (!results) results = createResultStream();
+        nextTick(function () { results.resume() });
+        return results;
+    };
+    
     return test;
 }

lib/results.js

@@ -12,16 +12,8 @@ module.exports = function (test) {
     output.queue('TAP version 13\n');
 
     var results = new Results(output);
-    var first = true;
-    output.push = function (t) {
-        results.push(t);
-        if (first) {
-            t.once('run', function () {
-                output.resume();
-            });
-        }
-        first = false;
-    };
+    output.push = function (t) { results.push(t) };
+    
     nextTick(function next () {
         var t = results.tests.shift();
         if (!t) return results.close();
@@ -61,7 +53,7 @@ Results.prototype.push = function (t, parentT) {
         st.on('end', function () {
             subtests --;
             if (subtests === 0 && !plan) t.emit('end');
-            onend();
+            nextTick(function () { onend.call(t) });
         });
         self.push(st, t);
         if (subtests === 1) nextTick(function () { st.run() });
@@ -81,17 +73,26 @@ Results.prototype.push = function (t, parentT) {
     t.on('end', onend);
 
     function onend () {
+        if (this.ended) return;
         if (subtests !== 0) return;
-        if (!plan && self.tests.length === 0) self.close();
+        if (!plan && self.tests.length === 0) {
+            nextTick(function () {
+                if (!plan && self.tests.length === 0) {
+                    self.close();
+                }
+            });
+        }
         else if (!plan && self.tests.length) {
             var t = self.tests.shift();
             nextTick(function () { t.run() });
-        };
+        }
     }
 };
 
 Results.prototype.close = function () {
     var self = this;
+if (self.closed) self.stream.emit('error', new Error('ALREADY CLOSED'));
+    self.closed = true;
     var write = function (s) { self.stream.queue(s) };
 
     write('\n1..' + self.count + '\n');