From 265aa2f6c8ba1040858fa19daa498eb0b67db3cd Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Tue, 29 Mar 2016 16:46:57 -0600
Subject: [PATCH] Warn rather than failing if we detect leaked pathwatcher
 subscriptions

---
 spec/git-repository-async-spec.js | 4 +---
 spec/spec-helper.coffee           | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/spec/git-repository-async-spec.js b/spec/git-repository-async-spec.js
index 900d81bfb..0442248e1 100644
--- a/spec/git-repository-async-spec.js
+++ b/spec/git-repository-async-spec.js
@@ -230,9 +230,7 @@ describe('GitRepositoryAsync', () => {
     })
   })
 
-  // @joshaber: Disabling for now. There seems to be some race with path
-  // subscriptions leading to intermittent test failures, e.g.: https://travis-ci.org/atom/atom/jobs/102702554
-  xdescribe('.checkoutHeadForEditor(editor)', () => {
+  describe('.checkoutHeadForEditor(editor)', () => {
     let filePath
     let editor
 
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 758a232aa..1194f2f76 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -112,14 +112,14 @@ afterEach ->
 
   document.getElementById('jasmine-content').innerHTML = '' unless window.debugContent
 
-  ensureNoPathSubscriptions()
+  warnIfLeakingPathSubscriptions()
   waits(0) # yield to ui thread to make screen update more frequently
 
-ensureNoPathSubscriptions = ->
+warnIfLeakingPathSubscriptions = ->
   watchedPaths = pathwatcher.getWatchedPaths()
-  pathwatcher.closeAllWatchers()
   if watchedPaths.length > 0
-    throw new Error("Leaking subscriptions for paths: " + watchedPaths.join(", "))
+    console.error("WARNING: Leaking subscriptions for paths: " + watchedPaths.join(", "))
+  pathwatcher.closeAllWatchers()
 
 ensureNoDeprecatedFunctionsCalled = ->
   deprecations = Grim.getDeprecations()