From 9a7d381a283dcbdad240370f696005fb96d93037 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 8 Nov 2016 21:27:40 +0100
Subject: [PATCH] chore(browserstack): properly teardown tunnel (#1745)

---
 scripts/browserstack/start_tunnel.js    |  2 +-
 scripts/browserstack/teardown_tunnel.sh | 16 ++++++++++++++--
 scripts/ci/sources/tunnel.sh            |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/browserstack/start_tunnel.js b/scripts/browserstack/start_tunnel.js
index cae1738541d..1bbb43b92a3 100644
--- a/scripts/browserstack/start_tunnel.js
+++ b/scripts/browserstack/start_tunnel.js
@@ -44,7 +44,7 @@ tunnel.start(function(error) {
     });
 
     if (READY_FILE) {
-      fs.writeFile(READY_FILE, '');
+      fs.writeFile(READY_FILE, process.pid);
     }
   }
 });
diff --git a/scripts/browserstack/teardown_tunnel.sh b/scripts/browserstack/teardown_tunnel.sh
index 86fd334284e..ba09b621e80 100755
--- a/scripts/browserstack/teardown_tunnel.sh
+++ b/scripts/browserstack/teardown_tunnel.sh
@@ -4,5 +4,17 @@ set -e -o pipefail
 
 
 echo "Shutting down Browserstack tunnel"
-echo "TODO: implement me"
-exit 1
\ No newline at end of file
+
+PID=$(cat $BROWSER_PROVIDER_READY_FILE);
+
+# Resolving the PID from the readyfile.
+kill $PID
+
+
+while [[ -n `ps -ef | grep $PID | grep -v "grep"` ]]; do
+  printf "."
+  sleep .5
+done
+
+echo ""
+echo "Browserstack tunnel has been shut down"
\ No newline at end of file
diff --git a/scripts/ci/sources/tunnel.sh b/scripts/ci/sources/tunnel.sh
index 1074fe1163f..62d29160ba8 100644
--- a/scripts/ci/sources/tunnel.sh
+++ b/scripts/ci/sources/tunnel.sh
@@ -34,7 +34,7 @@ teardown_tunnel() {
       ./scripts/sauce/sauce_connect_teardown.sh
       ;;
     browserstack*)
-      # ./scripts/browserstack/teardown_tunnel.sh
+      ./scripts/browserstack/teardown_tunnel.sh
       ;;
     *)
       ;;