From 5ff5df97be9e87e3c478de720aab7c8d97dc8022 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <tg@realm.io>
Date: Fri, 2 Mar 2018 12:06:00 -0800
Subject: [PATCH] Fix running nested-list-helper.js with node 8

---
 tests/js/nested-list-helper.js | 2 ++
 tests/js/session-tests.js      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/js/nested-list-helper.js b/tests/js/nested-list-helper.js
index e4b0803c..7de46e5e 100644
--- a/tests/js/nested-list-helper.js
+++ b/tests/js/nested-list-helper.js
@@ -9,6 +9,8 @@ const realmName = process.argv[4];
 const realmModule = process.argv[5];
 
 const Realm = require(realmModule);
+// Ensure that schemas.js gets the correct module with `require('realm')`
+require.cache[require.resolve('realm')] = require.cache[require.resolve(realmModule)];
 let schemas = require(process.argv[2]);
 
 function createObjects(user) {
diff --git a/tests/js/session-tests.js b/tests/js/session-tests.js
index 1ef8a21c..ee01c3c6 100644
--- a/tests/js/session-tests.js
+++ b/tests/js/session-tests.js
@@ -69,8 +69,8 @@ function runOutOfProcess() {
         try {
             execFile(process.execPath, args, {cwd: tmpDir.name}, (error, stdout, stderr) => {
                 if (error) {
-                    console.error("runOutOfProcess failed\n", error);
-                    reject(new Error(`Running ${modulePath} failed. error: ${error}`));
+                    console.error("runOutOfProcess failed\n", error, stdout, stderr);
+                    reject(new Error(`Running ${args[0]} failed. error: ${error}`));
                     return;
                 }