From b6df901a56db4c356ba8476cf9f5af06b3868ee0 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 18 May 2018 11:54:50 +0200
Subject: [PATCH] uninstall sourcemaps after test results are processed

---
 .../__tests__/__snapshots__/globals.test.js.snap          | 4 ++--
 packages/jest-runner/src/index.js                         | 8 +++++++-
 packages/jest-runner/src/run_test.js                      | 2 --
 packages/jest-runner/src/test_worker.js                   | 3 +++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/integration-tests/__tests__/__snapshots__/globals.test.js.snap b/integration-tests/__tests__/__snapshots__/globals.test.js.snap
index 30496da2c554..b15523f05467 100644
--- a/integration-tests/__tests__/__snapshots__/globals.test.js.snap
+++ b/integration-tests/__tests__/__snapshots__/globals.test.js.snap
@@ -31,7 +31,7 @@ exports[`cannot test with no implementation 1`] = `
         |     ^
       4 |     test('test, no implementation');
       5 |   
-
+      
       at packages/jest-jasmine2/build/jasmine/Env.js:<<LINE>>:<<COLUMN>>
       at __tests__/only-constructs.test.js:<<LINE>>:<<COLUMN>>
 
@@ -59,7 +59,7 @@ exports[`cannot test with no implementation with expand arg 1`] = `
         |     ^
       4 |     test('test, no implementation');
       5 |   
-
+      
       at packages/jest-jasmine2/build/jasmine/Env.js:<<LINE>>:<<COLUMN>>
       at __tests__/only-constructs.test.js:<<LINE>>:<<COLUMN>>
 
diff --git a/packages/jest-runner/src/index.js b/packages/jest-runner/src/index.js
index 2f4dd7243697..51d7ccdf8af9 100644
--- a/packages/jest-runner/src/index.js
+++ b/packages/jest-runner/src/index.js
@@ -23,6 +23,7 @@ import exit from 'exit';
 import runTest from './run_test';
 import throat from 'throat';
 import Worker from 'jest-worker';
+import sourcemapSupport from 'source-map-support';
 
 const TEST_WORKER_PATH = require.resolve('./test_worker');
 
@@ -81,7 +82,12 @@ class TestRunner {
               );
             })
             .then(result => onResult(test, result))
-            .catch(err => onFailure(test, err)),
+            .catch(err => onFailure(test, err))
+            .then(res => {
+              sourcemapSupport.resetRetrieveHandlers();
+
+              return res;
+            }),
         ),
       Promise.resolve(),
     );
diff --git a/packages/jest-runner/src/run_test.js b/packages/jest-runner/src/run_test.js
index e0627a7f0460..bedcf9139059 100644
--- a/packages/jest-runner/src/run_test.js
+++ b/packages/jest-runner/src/run_test.js
@@ -184,8 +184,6 @@ async function runTestInternal(
     });
   } finally {
     await environment.teardown();
-
-    sourcemapSupport.resetRetrieveHandlers();
   }
 }
 
diff --git a/packages/jest-runner/src/test_worker.js b/packages/jest-runner/src/test_worker.js
index 5b178df03a4b..d146e08078fc 100644
--- a/packages/jest-runner/src/test_worker.js
+++ b/packages/jest-runner/src/test_worker.js
@@ -13,6 +13,7 @@ import type {RawModuleMap} from 'types/HasteMap';
 import type {ErrorWithCode} from 'types/Errors';
 
 import exit from 'exit';
+import sourcemapSupport from 'source-map-support';
 import HasteMap from 'jest-haste-map';
 import {separateMessageFromStack} from 'jest-message-util';
 import Runtime from 'jest-runtime';
@@ -84,5 +85,7 @@ export async function worker({
     );
   } catch (error) {
     throw formatError(error);
+  } finally {
+    sourcemapSupport.resetRetrieveHandlers();
   }
 }