Exit with non-zero if input is empty or junk

aghassemi · Dec 13, 2017 · ebe8283 · ebe8283
1 parent 268cbee
commit ebe8283
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/lib/converter.js b/lib/converter.js
@@ -99,8 +99,14 @@ function converter(options) {
       });
     });
 
-    var xmlString = serialize(testSuites);
-    outStream.push(xmlString + '\n');
+    if (tapParser.sawValidTap) {
+      var xmlString = serialize(testSuites);
+      outStream.push(xmlString + '\n');
+    } else {
+      // Fail no valid tap found (normally means no plan line present)
+      // Note that is a less strict check than TapParser's strict mode.
+      exitCode = 1;
+    }
     result.exitCode = exitCode;
     outStream.emit('end');
   });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tap-xunit",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "TAP to xUnit XML converter.",
   "main": "lib/converter.js",
   "bin": {

diff --git a/test/bad/blank b/test/bad/blank
diff --git a/test/runner.js b/test/runner.js
@@ -9,9 +9,9 @@ var FILE_READ_OPTS = {
   encoding: 'utf-8'
 };
 
-runGoodInputTests('pass', 0); // input.pipe(xUnitConverter) == expected output
-runGoodInputTests('fail', 1);
-runBadInputTests(); // input.pipe(xUnitConverter) == parse error
+ runGoodInputTests('pass', 0); // input.pipe(xUnitConverter) == expected output
+ runGoodInputTests('fail', 1);
+ runBadInputTests(); // input.pipe(xUnitConverter) == parse error
 
 function runGoodInputTests(subdir, exitCode) {
   var INPUT_DIR = 'test/input/' + subdir;
@@ -74,15 +74,10 @@ function runBadInputTests() {
     test('parse error: ' + filename, function(assert) {
       var badInputFilePath = path.join(BAD_INPUT_DIR, filename);
       var inputStream = fs.createReadStream(badInputFilePath, FILE_READ_OPTS);
-      var tapToxUnitConverter = converter({strict:true});
+      var tapToxUnitConverter = converter();
       var xUnitStream = inputStream.pipe(tapToxUnitConverter);
       var numParseErrors = 0;
-      xUnitStream.on('error', function(err) {
-        assert.ok(err, err.message);
-        numParseErrors++;
-      });
       xUnitStream.on('end', function() {
-        assert.ok(numParseErrors > 0, 'had ' + numParseErrors + ' parse errors');
         assert.equals(tapToxUnitConverter.exitCode, 1, 'exitCode match');
         assert.end();
       });