forked from django-salesforce/django-salesforce
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request django-salesforce#128 from django-salesforce/run-t…
…ox-on-travis Use tox to multiplex tests on Travis
- Loading branch information
Showing
3 changed files
with
11 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,19 @@ | ||
sudo: false | ||
language: python | ||
python: | ||
# - "2.6" | ||
- "2.7" | ||
# - "3.3" | ||
env: | ||
global: | ||
- secure: "Z6wS6a/YcyT8w5l+2HfMItbn2mbv+f1W43WixoqB4QkgiocjBWvmAQD6PN1sEgWVmZlRvWCABK8FcGG+Y6RPFeNdCE0U1h9hEgOiAnhUpWWH/AhOYDZ0PnFwA3/iRrHS2VFPmhdkjw1BUEfqXaJfDYtlZLgpMMfRvEjIJ8Uqq6M=" | ||
- secure: "JJGGbExBKyXkAltrc4rRLG56ks20/GfGcfugI9mqjeHgQ7IcDvhnouqAIjfbNlhgclyAkWHwJRs7taaM0T9a9AcEQujs2B0JJYOLQSBGnWJSCbsDspWAdlT92U+PzhnZrDm7apg1iBk/c8KtofBo6DqsTveBocFnYXTjeqbSVuY=" | ||
- secure: "TrsYtntXQWgjrXPFaL3aUPoyPtR7pBVqsRx5dIj0yhrPuZR0L2bFi0MOA8cXflaYucx+xa+PEyrPO6FfLl+ri8I2WiXeDLbXlUC614UW6Od1kCklZ7/gk5wor7RwfEtIAtxh5erljUw2N2O9utkRFBDCuASRaQCqBzMItgcUOhA=" | ||
- secure: "CZWsHsATIIAdvAWoHM1niGa8KGfcDR9p49vr/um6DU2wDWt3SVxOei+Z+X8lvIJs4JXiJHzIo6H4qrqf8qxf3hDWjx4TIERz35+5osAWstLkCAxcaWV8JlomxVI+P8tU7dCgZdBeLkVi1O+H8+B2bAVXdK77gcQkSttGh/ykm48=" | ||
matrix: | ||
# - DJANGO_VERSION=1.4.10 | ||
# - DJANGO_VERSION=1.5.5 | ||
- DJANGO_VERSION=1.7.7 | ||
matrix: | ||
exclude: | ||
- python: "3.3" | ||
env: DJANGO_VERSION=1.4.10 | ||
- TOX_TESTENV_PASSENV="SF_CONSUMER_KEY SF_CONSUMER_SECRET SF_USER SF_PASSWORD" | ||
cache: | ||
directories: | ||
- $HOME/.pip-cache/ | ||
before_install: | ||
- "pip install setuptools_git" | ||
install: | ||
- "pip install Django==$DJANGO_VERSION" | ||
- "pip install -r requirements.txt" | ||
- "pip install ." | ||
- pip install tox | ||
script: | ||
- echo -e "import ssl\nSF_SSL = dict(ssl_version=ssl.PROTOCOL_SSLv23)" > salesforce/testrunner/local_settings.py | ||
- python manage.py syncdb --noinput | ||
- bash tests/inspectdb/test.sh | ||
- bash tests/tests.sh | ||
- python manage.py test salesforce | ||
- echo -e "SF_PK = 'Id'" > salesforce/testrunner/local_settings.py | ||
- tox -r |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
#!/bin/sh | ||
#!/bin/bash | ||
RET=0 | ||
for x in tests/test_*; do | ||
if test -a $x/test.sh; then | ||
if test -e $x/test.sh; then | ||
echo | ||
echo "== $x ==" | ||
$x/test.sh || RET=$? | ||
fi | ||
done | ||
test $RET == 0 | ||
test $RET -eq 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters