From 75289ee3ddce2406bbd64717f100462ae256da9d Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 6 May 2015 10:29:34 -0700
Subject: [PATCH] Fix some integration test flakiness

---
 spec/integration/helpers/start-atom.coffee | 28 +++++++++++++++-------
 spec/integration/startup-spec.coffee       |  2 ++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/spec/integration/helpers/start-atom.coffee b/spec/integration/helpers/start-atom.coffee
index 0de6644b3..646281171 100644
--- a/spec/integration/helpers/start-atom.coffee
+++ b/spec/integration/helpers/start-atom.coffee
@@ -15,15 +15,23 @@ ChromedriverPort = 9515
 ChromedriverURLBase = "/wd/hub"
 ChromedriverStatusURL = "http://localhost:#{ChromedriverPort}#{ChromedriverURLBase}/status"
 
-pollChromeDriver = (done) ->
+chromeDriverUp = (done) ->
   checkStatus = ->
-    http.get(ChromedriverStatusURL, (response) ->
-      if response.statusCode is 200
-        done()
-      else
-        pollChromeDriver(done)
-    ).on("error", -> pollChromeDriver(done))
+    http
+      .get ChromedriverStatusURL, (response) ->
+        if response.statusCode is 200
+          done()
+        else
+          chromeDriverUp(done)
+      .on("error", -> chromeDriverUp(done))
+  setTimeout(checkStatus, 100)
 
+chromeDriverDown = (done) ->
+  checkStatus = ->
+    http
+      .get ChromedriverStatusURL, (response) ->
+        chromeDriverDown(done)
+      .on("error", done)
   setTimeout(checkStatus, 100)
 
 buildAtomClient = (args, env) ->
@@ -137,9 +145,9 @@ module.exports = (args, env, fn) ->
       chromedriver.stderr.on "close", ->
         resolve(errorCode)
 
-  waitsFor("webdriver to start", pollChromeDriver, 15000)
+  waitsFor("webdriver to start", chromeDriverUp, 15000)
 
-  waitsFor("webdriver to finish", (done) ->
+  waitsFor("tests to run", (done) ->
     finish = once ->
       client
         .simulateQuit()
@@ -162,3 +170,5 @@ module.exports = (args, env, fn) ->
 
     fn(client.init()).then(finish)
   , 30000)
+
+  waitsFor("webdriver to stop", chromeDriverDown, 15000)
diff --git a/spec/integration/startup-spec.coffee b/spec/integration/startup-spec.coffee
index b20427954..828193e4d 100644
--- a/spec/integration/startup-spec.coffee
+++ b/spec/integration/startup-spec.coffee
@@ -150,10 +150,12 @@ describe "Starting Atom", ->
           .waitForWindowCount(2, 10000)
           .then ({value: windowHandles}) ->
             @window(windowHandles[0])
+            .waitForExist("atom-workspace")
             .treeViewRootDirectories()
             .then ({value: directories}) -> windowProjectPaths.push(directories)
 
             .window(windowHandles[1])
+            .waitForExist("atom-workspace")
             .treeViewRootDirectories()
             .then ({value: directories}) -> windowProjectPaths.push(directories)