File tree Expand file tree Collapse file tree
Open diff view settings
Expand file tree Collapse file tree
Open diff view settings
Original file line number Diff line number Diff line change 88 - tox -e py26
99 - tox -e py27
1010 - tox -e lint
11- - scripts/run_regression.sh
11+ - tox -e regression
1212after_success :
1313 - tox -e cover
1414 - coveralls
Original file line number Diff line number Diff line change 22
33set -ev
44
5- # If merging to master and not a pull request, run regression test.
6- if [ " ${TRAVIS_BRANCH} " == " master" && [ " ${TRAVIS_PULL_REQUEST} " == " false" ; then
7- # Convert encrypted key file into decrypted file to be used.
8- openssl aes-256-cbc -K $encrypted_a1b222e8c14d_key \
9- -iv $encrypted_a1b222e8c14d_iv \
10- -in regression/key.p12.enc \
11- -out $GCLOUD_TESTS_KEY_FILE -d
12- tox -e regression
5+ # If we're on Travis, we need to set up the environment.
6+ if [[ " ${TRAVIS} " == " true" ; then
7+ # If merging to master and not a pull request, run regression test.
8+ if [ " ${TRAVIS_BRANCH} " == " master" && [ " ${TRAVIS_PULL_REQUEST} " == " false" ; then
9+ echo " Running in Travis during merge, decrypting stored key file."
10+
11+ # Convert encrypted key file into decrypted file to be used.
12+ openssl aes-256-cbc -K $encrypted_a1b222e8c14d_key \
13+ -iv $encrypted_a1b222e8c14d_iv \
14+ -in regression/key.p12.enc \
15+ -out $GCLOUD_TESTS_KEY_FILE -d
16+ else
17+ echo " Running in Travis during non-merge to master, doing nothing."
18+ exit
19+ fi
1320fi
21+
22+ # Run the regression tests for each tested package.
23+ python regression/run_regression.py --package datastore
Original file line number Diff line number Diff line change 5757basepython =
5858 python2.7
5959commands =
60- python regression/ run_regression.py --package datastore
60+ {toxinidir}/scripts/ run_regression.sh
6161deps =
6262 unittest2
You can’t perform that action at this time.
0 commit comments