Skip to content

Commit 5e53c14

Browse files
author
James Halliday
committed
fix merge conflicts
2 parents 128509c + 2666849 commit 5e53c14

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

index.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function createHarness (conf_) {
2727

2828
var began = false;
2929
var only = false;
30+
var closed = false;
3031
var out = new Render();
3132

3233
var test = function (name, conf, cb) {
@@ -37,7 +38,10 @@ function createHarness (conf_) {
3738
if (conf.exit !== false) {
3839
onexit(function (code) {
3940
t._exit();
40-
out.close();
41+
if (!closed) {
42+
closed = true
43+
out.close();
44+
}
4145
if (!code && !t._ok && (!only || name === only)) {
4246
process.exit(1);
4347
}
@@ -92,7 +96,8 @@ function createHarness (conf_) {
9296
process.nextTick(function () {
9397
running = false;
9498
if (pending.length) return pending.shift()();
95-
if (count === 0) {
99+
if (count === 0 && !closed) {
100+
closed = true
96101
out.close();
97102
}
98103
if (conf.exit !== false && canExit && !t._ok) {

0 commit comments

Comments
 (0)