Ensure doctests run in sequence to avoid mangled stdout

davidchambers · Apr 12, 2020 · cb273b3 · cb273b3
1 parent 84afa33
commit cb273b3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 26 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -23,13 +23,17 @@ exports.runDoctests = function(doctest, program) {
     ]));
     process.exit (1);
   }
-  Promise.all (program.args.map (function(path) {
-    return (doctest (path, program)).then (function(results) {
-      return results.reduce (function(status, tuple) {
-        return tuple[0] ? status : 1;
-      }, 0);
+  program.args.reduce (function(promise, path) {
+    return promise.then (function(statuses) {
+      return doctest (path, program).then (function(results) {
+        var status = results.reduce (function(status, tuple) {
+          return tuple[0] ? status : 1;
+        }, 0);
+        return statuses.concat ([status]);
+      });
     });
-  })).then (function(statuses) {
+  }, Promise.resolve ([]))
+  .then (function(statuses) {
     process.exit (statuses.every (function(s) { return s === 0; }) ? 0 : 1);
   }, function(err) {
     process.stderr.write (exports.formatErrors ([err.message]));

diff --git a/test/index.js b/test/index.js
@@ -158,26 +158,26 @@ testCommand ('bin/doctest test/shared/index.coffee', {
   stderr: ''
 });
 
-// testCommand ('bin/doctest test/shared/index.js test/shared/index.coffee', {
-//   status: 1,
-//   stdout: unlines ([
-//     'running doctests in test/shared/index.js...',
-//     '......x.x...........x........x',
-//     'FAIL: expected 5 on line 31 (got 4)',
-//     'FAIL: expected ! TypeError on line 38 (got 0)',
-//     'FAIL: expected 9.5 on line 97 (got 5)',
-//     'FAIL: expected "on automatic semicolon insertion" on line 155 ' +
-//       '(got "the rewriter should not rely")',
-//     'running doctests in test/shared/index.coffee...',
-//     '......x.x...........x........x',
-//     'FAIL: expected 5 on line 31 (got 4)',
-//     'FAIL: expected ! TypeError on line 38 (got 0)',
-//     'FAIL: expected 9.5 on line 97 (got 5)',
-//     'FAIL: expected "on automatic semicolon insertion" on line 155 ' +
-//       '(got "the rewriter should not rely")'
-//   ]),
-//   stderr: ''
-// });
+testCommand ('bin/doctest test/shared/index.js test/shared/index.coffee', {
+  status: 1,
+  stdout: unlines ([
+    'running doctests in test/shared/index.js...',
+    '......x.x...........x........x',
+    'FAIL: expected 5 on line 31 (got 4)',
+    'FAIL: expected ! TypeError on line 38 (got 0)',
+    'FAIL: expected 9.5 on line 97 (got 5)',
+    'FAIL: expected "on automatic semicolon insertion" on line 155 ' +
+      '(got "the rewriter should not rely")',
+    'running doctests in test/shared/index.coffee...',
+    '......x.x...........x........x',
+    'FAIL: expected 5 on line 31 (got 4)',
+    'FAIL: expected ! TypeError on line 38 (got 0)',
+    'FAIL: expected 9.5 on line 97 (got 5)',
+    'FAIL: expected "on automatic semicolon insertion" on line 155 ' +
+      '(got "the rewriter should not rely")'
+  ]),
+  stderr: ''
+});
 
 testCommand ('bin/doctest --silent test/shared/index.js', {
   status: 1,