Skip to content

chore: remove inactive browserstack wrapper package #1991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 1, 2016
Merged

chore: remove inactive browserstack wrapper package #1991

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b5662b
chore: remove inactive browserstack wrapper package
devversion Nov 26, 2016
168afd6
Fix incorrect comments
devversion Nov 29, 2016
a64876e
Don't wait for tunnel if timer exceeded
devversion Nov 30, 2016
e5ece42
Fix race conditions
devversion Nov 30, 2016
eb232ab
Add empty line before logging that the tunnel is ready.
devversion Nov 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ env:
- BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
- ARCH=linux-x64
- BROWSER_PROVIDER_READY_FILE=/tmp/angular-material2-build/readyfile
- BROWSER_PROVIDER_ERROR_FILE=/tmp/angular-material2-build/errorfile
# GITHUB_TOKEN_ANGULAR
- secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
matrix:
Expand Down
2 changes: 1 addition & 1 deletion scripts/browserstack/start_tunnel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function create_ready_file {

# To be able to exit the tail properly we need to have a sub shell spawned, which is
# used to track the state of tail.
sleep 120 &
{ sleep 120; touch $BROWSER_PROVIDER_ERROR_FILE; } &

TIMER_PID=$!

Expand Down
6 changes: 6 additions & 0 deletions scripts/browserstack/waitfor_tunnel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

TUNNEL_LOG="$LOGS_DIR/browserstack-tunnel.log"

# Wait for Connect to be ready before exiting
# Time out if we wait for more than 2 minutes, so the process won't run forever.
Expand All @@ -12,6 +13,11 @@ while [ ! -f $BROWSER_PROVIDER_READY_FILE ]; do
echo
echo "Timed out after 2 minutes waiting for tunnel ready file"
exit 5
elif [ -f $BROWSER_PROVIDER_ERROR_FILE ]; then
Copy link
Contributor

@hansl hansl Nov 30, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a race condition here, since READY_FILE will still be created when ERROR_FILE exists. Moving this IF outside the while will ensure we always take care of this case.

echo
echo "An error occurred while starting the tunnel. See error:"
cat $TUNNEL_LOG
exit 5
fi

printf "."
Expand Down