Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

Commit 7beca52

Browse files
author
Keen Yee Liau
committed
ci: Log sauce connect proxy to stdout, remove travis_wait, upgrade proxy to 4.5.4
travis_wait is not needed if the sauce connect proxy logs are written to stdout. This makes debugging proxy problems from the CI logs much easier. This commit also updates the debugging command to use the `--doctor` flag. Other changes include: 1. Upgrade sauce-connect proxy to 4.4.1 to 4.5.4
1 parent 23e4b30 commit 7beca52

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ before_script:
4242
- npm run install_testapp
4343
- npm run pretest
4444
- mkdir -p $LOGS_DIR
45-
- travis_wait ./scripts/travis_setup.sh
45+
- scripts/travis_setup.sh
4646

4747

4848
script:
4949
- ./scripts/testserver.sh
5050
- ./scripts/test_on_travis.sh
5151

5252
after_script:
53-
- ./scripts/print_logs.sh
53+
- ./scripts/print_logs.sh

‎scripts/sauce_connect_setup.sh‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ set -e
1212
# before_script:
1313
# - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
1414

15-
CONNECT_URL="https://saucelabs.com/downloads/sc-4.4.1-linux.tar.gz"
15+
CONNECT_DOWNLOAD="sc-4.5.4-linux.tar.gz"
16+
CONNECT_URL="https://saucelabs.com/downloads/${CONNECT_DOWNLOAD}"
1617
CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
17-
CONNECT_DOWNLOAD="sc-4.4.1-linux.tar.gz"
1818

19-
CONNECT_LOG="$LOGS_DIR/sauce-connect"
20-
CONNECT_STDOUT="$LOGS_DIR/sauce-connect.stdout"
21-
CONNECT_STDERR="$LOGS_DIR/sauce-connect.stderr"
19+
# Log files are not used for now
20+
# CONNECT_LOG="$LOGS_DIR/sauce-connect"
21+
# CONNECT_STDOUT="$LOGS_DIR/sauce-connect.stdout"
22+
# CONNECT_STDERR="$LOGS_DIR/sauce-connect.stderr"
2223

2324
# Get Connect and start it
2425
mkdir -p $CONNECT_DIR
@@ -42,14 +43,11 @@ if [ ! -z "$BROWSER_PROVIDER_READY_FILE" ]; then
4243
fi
4344

4445

45-
echo "Starting Sauce Connect in the background, logging into:"
46-
echo " $CONNECT_LOG"
47-
echo " $CONNECT_STDOUT"
48-
echo " $CONNECT_STDERR"
49-
sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \
50-
2> $CONNECT_STDERR 1> $CONNECT_STDOUT &
46+
echo "Starting Sauce Connect in the background, args:"
47+
echo " $ARGS"
48+
sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS &
5149

52-
# If you need to debug sauce connect, use the full output like so:
53-
#
54-
# sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \
55-
# --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT &
50+
# If you need to debug sauce connect, use the --doctor flag.
51+
# It will print diagnostic messages but will not start a tunnel.
52+
# See https://wiki.saucelabs.com/display/DOCS/Sauce+Connect+Proxy+Debugging+and+Diagnostics+with+--doctor+flag
53+
# sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY --doctor $ARGS

‎scripts/travis_setup.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
if [ $JOB == "bstack" ]; then
2+
echo "Setting up Browser Stack"
23
./scripts/browserstack_local_setup.sh
34
else
5+
echo "Setting up Sauce Labs"
46
./scripts/sauce_connect_setup.sh
57
./scripts/wait_for_browser_provider.sh
68
fi

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /