From 88d8a6498b02be9bda97d3fbdfa52b8fbf97900a Mon Sep 17 00:00:00 2001
From: Joe Lim <xjlim@users.noreply.github.com>
Date: Sun, 5 Nov 2017 04:12:50 -0800
Subject: [PATCH] one-line waiting for app start (#3411)

* one-line waiting for app start

* remove fixed todo
---
 appveyor.yml             |  4 +---
 tasks/e2e-kitchensink.sh | 18 ++----------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ffe48fc8585..5d957aa7eea 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,8 +28,6 @@ platform:
   - x64
 
 install:
-  # TODO: Remove after https://github.com/appveyor/ci/issues/1426 is fixed
-  - set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
   - ps: Install-Product node $env:nodejs_version $env:platform
 
 build: off
@@ -41,4 +39,4 @@ skip_commits:
 test_script:
   - node --version
   - npm --version
-  - sh tasks/e2e-%test_suite%.sh
+  - bash tasks/e2e-%test_suite%.sh
diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh
index c1167c1dedf..547821b652a 100755
--- a/tasks/e2e-kitchensink.sh
+++ b/tasks/e2e-kitchensink.sh
@@ -218,14 +218,7 @@ PORT=3001 \
   REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \
   NODE_PATH=src \
   nohup npm start &>$tmp_server_log &
-while true
-do
-  if grep -q 'You can now view' $tmp_server_log; then
-    break
-  else
-    sleep 1
-  fi
-done
+grep -q 'You can now view' <(tail -f $tmp_server_log)
 E2E_URL="http://localhost:3001" \
   REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \
   CI=true NODE_PATH=src \
@@ -287,14 +280,7 @@ PORT=3002 \
   REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \
   NODE_PATH=src \
   nohup npm start &>$tmp_server_log &
-while true
-do
-  if grep -q 'You can now view' $tmp_server_log; then
-    break
-  else
-    sleep 1
-  fi
-done
+grep -q 'You can now view' <(tail -f $tmp_server_log)
 E2E_URL="http://localhost:3002" \
   REACT_APP_SHELL_ENV_MESSAGE=fromtheshell \
   CI=true NODE_PATH=src \