Commit c29b88f1 authored by Michal Čihař's avatar Michal Čihař

Default to sqlite database for tests if not specified

This allows us to simplify travis setup.
Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent cd6263f9
......@@ -8,13 +8,13 @@ python:
# - Run pylint/pep8 checker
env:
matrix:
- DJANGO_PIP="Django" TRAVIS_DATABASE=sqlite DO_LINT=1
- DJANGO_PIP="Django>=1.5,<1.6" TRAVIS_DATABASE=sqlite TRAVIS_RUN_TESTS="trans lang accounts"
- DJANGO_PIP="Django" DO_LINT=1
- DJANGO_PIP="Django>=1.5,<1.6" TRAVIS_RUN_TESTS="trans lang accounts"
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=mysql
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=postgresql
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=sqlite
- DJANGO_PIP="https://www.djangoproject.com/download/1.7c2/tarball/" TRAVIS_DATABASE=sqlite
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=sqlite TRAVIS_RUN_TESTS="-p test_selenium.py" DO_SELENIUM=1
- DJANGO_PIP="Django>=1.6,<1.7"
- DJANGO_PIP="https://www.djangoproject.com/download/1.7c2/tarball/"
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_RUN_TESTS="-p test_selenium.py" DO_SELENIUM=1
global:
# Sauce labs setup
- secure: "W4EtqCQSbSWb2sDwHd0obttzUTKIPyFZE90qD+YdV76YLgIK7QX4Vc6Hx9fRRNy397h4RrYIzyU2vemGIR5j8cR16Y6MyJ8Fy4DyC2mHyo3T7Tx4/cJYTQDPF2G4kxjR+vmhsdQIdmaYLsjtb2C2M0aIkU8FGFv6D3+TXqsoOmI="
......@@ -28,7 +28,7 @@ install:
- pip install -r requirements.txt
- pip install -r requirements-optional.txt
- pip install -r travis/requirements.txt
- pip install -r travis/requirements-$TRAVIS_DATABASE.txt
- pip install -r travis/requirements-${TRAVIS_DATABASE:-sqlite}.txt
# create databases
before_script:
- mysql -e 'create database weblate;'
......@@ -38,7 +38,7 @@ before_script:
script:
- if [ -n "$DO_LINT" ] ; then ./scripts/generate-locales ; fi
- if [ -z "$DO_LINT" ] ; then ./manage.py validate --settings weblate.settings_test ; fi
- if [ $TRAVIS_DATABASE = sqlite -a -z "$DO_LINT" ] ; then ./travis/migrate-testing ; fi
- if [ "$TRAVIS_DATABASE" = sqlite -a -z "$DO_LINT" ] ; then ./travis/migrate-testing ; fi
- if [ -z "$DO_LINT" ] ; then ./manage.py syncdb --noinput --settings weblate.settings_test ; fi
- if [ -z "$DO_LINT" ] ; then ./manage.py migrate --settings weblate.settings_test --traceback ; fi
- if [ -z "$DO_LINT" ] ; then coverage run --source=. ./manage.py test --settings weblate.settings_test $TRAVIS_RUN_TESTS ; fi
......@@ -50,4 +50,4 @@ after_script:
matrix:
allow_failures:
- python: "2.7"
env: DJANGO_PIP="https://www.djangoproject.com/download/1.7c2/tarball/" TRAVIS_DATABASE=sqlite
env: DJANGO_PIP="https://www.djangoproject.com/download/1.7c2/tarball/"
......@@ -64,7 +64,6 @@ class SeleniumTests(LiveServerTestCase):
cls.caps['tags'] = [
'python-{}'.format(os.environ['TRAVIS_PYTHON_VERSION']),
'django-{}'.format(django.get_version()),
os.environ['TRAVIS_DATABASE'],
'CI'
]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment