From f228aa05db71e5f8c04d48d110bde32e71b88837 Mon Sep 17 00:00:00 2001
From: Richard Lau <riclau@uk.ibm.com>
Date: Thu, 3 Nov 2016 15:58:44 -0400
Subject: [PATCH] Validate only one report is produced

---
 test/common.js           | 6 +++---
 test/test-api.js         | 9 ++++-----
 test/test-exception.js   | 9 ++++-----
 test/test-fatal-error.js | 9 ++++-----
 test/test-signal.js      | 9 ++++-----
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/test/common.js b/test/common.js
index 2d1ba2d..2d498f6 100644
--- a/test/common.js
+++ b/test/common.js
@@ -9,11 +9,11 @@ const REPORT_SECTIONS = [
   'System Information'
 ];
 
-exports.locate = (pid) => {
+exports.findReports = (pid) => {
   // Default NodeReport filenames are of the form NodeReport.<date>.<time>.<pid>.<seq>.txt
   const filePattern = new RegExp('^NodeReport\\.\\d+\\.\\d+\\.' + pid + '\\.\\d+\\.txt$');
-  var files = fs.readdirSync(".");
-  return files.find((file) => filePattern.test(file));
+  const files = fs.readdirSync(".");
+  return files.filter((file) => filePattern.test(file));
 };
 
 exports.validate = (t, report, pid) => {
diff --git a/test/test-api.js b/test/test-api.js
index 919a90b..e552d7c 100644
--- a/test/test-api.js
+++ b/test/test-api.js
@@ -15,10 +15,9 @@ if (process.argv[2] === 'child') {
     tap.plan(3);
     tap.equal(code, 0, 'Process exited cleanly');
     // Locate and validate the NodeReport
-    const report = common.locate(child.pid);
-    tap.ok(report, 'found report ' + report);
-    if (report) {
-      common.validate(tap, report, child.pid);
-    }
+    const reports = common.findReports(child.pid);
+    tap.equal(reports.length, 1, 'Found reports ' + reports);
+    const report = reports[0];
+    common.validate(tap, report, child.pid);
   });
 };
diff --git a/test/test-exception.js b/test/test-exception.js
index b9b7d61..5b4c4ce 100644
--- a/test/test-exception.js
+++ b/test/test-exception.js
@@ -29,10 +29,9 @@ if (process.argv[2] === 'child') {
     tap.equal(signal, expectedSignal, 'Process should exit with signal ' + expectedSignal);
 
     // Locate and validate the NodeReport
-    const report = common.locate(child.pid);
-    tap.ok(report, 'found report ' + report);
-    if (report) {
-      common.validate(tap, report, child.pid);
-    }
+    const reports = common.findReports(child.pid);
+    tap.equal(reports.length, 1, 'Found reports ' + reports);
+    const report = reports[0];
+    common.validate(tap, report, child.pid);
   });
 };
diff --git a/test/test-fatal-error.js b/test/test-fatal-error.js
index 2ddb60c..6968b23 100644
--- a/test/test-fatal-error.js
+++ b/test/test-fatal-error.js
@@ -26,10 +26,9 @@ if (process.argv[2] === 'child') {
     tap.plan(3);
     tap.notEqual(code, 0, 'Process should not exit cleanly');
     // Locate and validate the NodeReport
-    const report = common.locate(child.pid);
-    tap.ok(report, 'found report ' + report);
-    if (report) {
-      common.validate(tap, report, child.pid);
-    }
+    const reports = common.findReports(child.pid);
+    tap.equal(reports.length, 1, 'Found reports ' + reports);
+    const report = reports[0];
+    common.validate(tap, report, child.pid);
   });
 };
diff --git a/test/test-signal.js b/test/test-signal.js
index ea7e67c..96cba57 100644
--- a/test/test-signal.js
+++ b/test/test-signal.js
@@ -56,10 +56,9 @@ if (process.argv[2] === 'child') {
     tap.equal(code, null, 'Process should not exit cleanly');
     tap.equal(signal, 'SIGTERM', 'Process should exit with SIGTERM');
     // Locate and validate the NodeReport
-    const report = common.locate(child.pid);
-    tap.ok(report, 'found report ' + report);
-    if (report) {
-      common.validate(tap, report, child.pid);
-    }
+    const reports = common.findReports(child.pid);
+    tap.equal(reports.length, 1, 'Found reports ' + reports);
+    const report = reports[0];
+    common.validate(tap, report, child.pid);
   });
 };