From 18dfdcbf52eddc54b23e7f4756d9db1e6d83a92c Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Mon, 24 Jun 2019 07:47:26 -0700
Subject: [PATCH] better error handling in case of loader error in tests

---
 test/electron/index.js    | 7 +++++++
 test/electron/renderer.js | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/test/electron/index.js b/test/electron/index.js
index ebd97e3b98b..b0d82f6d1bd 100644
--- a/test/electron/index.js
+++ b/test/electron/index.js
@@ -100,6 +100,13 @@ function parseReporterOption(value) {
 
 app.on('ready', () => {
 
+	ipcMain.on('error', (_, err) => {
+		if (!argv.debug) {
+			console.error(err);
+			app.exit(1);
+		}
+	});
+
 	const win = new BrowserWindow({
 		height: 600,
 		width: 800,
diff --git a/test/electron/renderer.js b/test/electron/renderer.js
index addb1f0b93c..bd8cba69214 100644
--- a/test/electron/renderer.js
+++ b/test/electron/renderer.js
@@ -273,5 +273,12 @@ function runTests(opts) {
 
 ipcRenderer.on('run', (e, opts) => {
 	initLoader(opts);
-	runTests(opts).catch(err => console.error(typeof err === 'string' ? err : JSON.stringify(err)));
+	runTests(opts).catch(err => {
+		if (!(typeof err !== 'string')) {
+			err = JSON.stringify(err);
+		}
+
+		console.error(err);
+		ipcRenderer.send('error', err);
+	});
 });