From 6a0696738b4a3393a303f3df415c1c4d8f97ded7 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Tue, 22 Sep 2015 21:28:17 -0700 Subject: [PATCH] build(travis): gracefully shut down the sauce connect tunnel after the tests are done running This is to prevent sauce connect tunnel leaks. --- .travis.yml | 1 + lib/browserstack/teardown_tunnel.sh | 8 ++++++++ lib/saucelabs/teardown_tunnel.sh | 16 ++++++++++++++++ scripts/travis/tear_down_browser_provider.sh | 4 ++++ 4 files changed, 29 insertions(+) create mode 100755 lib/browserstack/teardown_tunnel.sh create mode 100755 lib/saucelabs/teardown_tunnel.sh create mode 100755 scripts/travis/tear_down_browser_provider.sh diff --git a/.travis.yml b/.travis.yml index e4642d2c0571..bc72204be841 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,7 @@ script: - ./scripts/travis/build.sh after_script: + - ./scripts/travis/tear_down_browser_provider.sh - ./scripts/travis/print_logs.sh notifications: diff --git a/lib/browserstack/teardown_tunnel.sh b/lib/browserstack/teardown_tunnel.sh new file mode 100755 index 000000000000..86fd334284e3 --- /dev/null +++ b/lib/browserstack/teardown_tunnel.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +set -e -o pipefail + + +echo "Shutting down Browserstack tunnel" +echo "TODO: implement me" +exit 1 \ No newline at end of file diff --git a/lib/saucelabs/teardown_tunnel.sh b/lib/saucelabs/teardown_tunnel.sh new file mode 100755 index 000000000000..fb294747fdec --- /dev/null +++ b/lib/saucelabs/teardown_tunnel.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e -o pipefail + + +echo "Shutting down Sauce Connect tunnel" + +killall sc + +while [[ -n `ps -ef | grep "bin/sc" | grep -v "grep"` ]]; do + printf "." + sleep .5 +done + +echo "" +echo "Sauce Connect tunnel has bee shut down" diff --git a/scripts/travis/tear_down_browser_provider.sh b/scripts/travis/tear_down_browser_provider.sh new file mode 100755 index 000000000000..1b1b7314cf5f --- /dev/null +++ b/scripts/travis/tear_down_browser_provider.sh @@ -0,0 +1,4 @@ +#!/bin/bash +# Has to be run from project root directory. + +./lib/${BROWSER_PROVIDER}/teardown_tunnel.sh