Refactor test run
This commit is contained in:
parent
eaae535896
commit
8a6b54e1c9
5 changed files with 32 additions and 20 deletions
29
.travis.yml
29
.travis.yml
|
@ -10,35 +10,38 @@ python:
|
|||
|
||||
env:
|
||||
matrix:
|
||||
- DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- DJANGO='django15' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- DJANGO='django16' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- DJANGO='django17' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
|
||||
# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
|
||||
install:
|
||||
- pip install $DJANGO
|
||||
- pip install -r requirements-test.txt
|
||||
- pip install -U tox>=1.8 coveralls
|
||||
- "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi"
|
||||
- "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
|
||||
- "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
|
||||
- "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
|
||||
|
||||
# command to run tests, e.g. python setup.py test
|
||||
script: djangocms-helper djangocms_blog test --cms --nose-runner
|
||||
script: COMMAND='coverage run' tox -e"$PYVER-$DJANGO"
|
||||
|
||||
after_success: coveralls
|
||||
|
||||
matrix:
|
||||
exclude:
|
||||
- python: 2.6
|
||||
env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
env: DJANGO='django17' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
|
||||
allow_failures:
|
||||
- python: 3.3
|
||||
env: DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
env: DJANGO='django15' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- python: 3.3
|
||||
env: DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
env: DJANGO='django16' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- python: 3.3
|
||||
end: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
end: DJANGO='django17' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- python: 3.4
|
||||
env: DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
env: DJANGO='django15' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- python: 3.4
|
||||
env: DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
env: DJANGO='django16' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
- python: 3.4
|
||||
env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
env: DJANGO='django17' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1
|
||||
|
|
|
@ -94,3 +94,14 @@ HELPER_SETTINGS = {
|
|||
}
|
||||
if 'test' in sys.argv:
|
||||
HELPER_SETTINGS['INSTALLED_APPS'].append('django_nose')
|
||||
|
||||
|
||||
def run():
|
||||
from collections import defaultdict
|
||||
from djangocms_helper import main
|
||||
args = defaultdict(str)
|
||||
args['<application>'] = 'djangocms_blog'
|
||||
args['test'] = True
|
||||
args['--cms'] = True
|
||||
args['--nose-runner'] = True
|
||||
main.core(args=args, application='djangocms_blog')
|
||||
|
|
|
@ -5,5 +5,5 @@ mock>=1.0.1
|
|||
nose>=1.3.0
|
||||
django-nose>=1.2
|
||||
flake8
|
||||
https://github.com/nephila/djangocms-helper/archive/django_17.zip
|
||||
djangocms-helper>=0.5
|
||||
tox>=1.8
|
||||
|
|
3
setup.py
3
setup.py
|
@ -50,11 +50,12 @@ setup(
|
|||
'cmsplugin-filer',
|
||||
'django-meta>=0.2',
|
||||
'django-meta-mixin>=0.1.1',
|
||||
'south>=1.0.1',
|
||||
'south>=1.0.1',
|
||||
],
|
||||
license="BSD",
|
||||
zip_safe=False,
|
||||
keywords='djangocms-blog, blog, django, wordpress, multilingual',
|
||||
test_suite='cms_helper.run',
|
||||
classifiers=[
|
||||
'Development Status :: 4 - Beta',
|
||||
'Framework :: Django',
|
||||
|
|
7
tox.ini
7
tox.ini
|
@ -1,14 +1,11 @@
|
|||
[tox]
|
||||
envlist = {py26,py27}-django{15,16},{py27}-django{17}
|
||||
envlist = py{26}-django{15,16},py{27,33,34}-django{15,16,17}
|
||||
|
||||
[testenv]
|
||||
basepython =
|
||||
py26: python2.6
|
||||
py27: python2.7
|
||||
deps =
|
||||
django15: Django>=1.5,<1.6
|
||||
django16: Django>=1.6,<1.7
|
||||
django17: Django>=1.7,<1.8
|
||||
py26: unittest2
|
||||
-r{toxinidir}/requirements-test.txt
|
||||
commands = djangocms-helper djangocms_blog test --cms --nose
|
||||
commands = {env:COMMAND:python} setup.py test
|
||||
|
|
Loading…
Reference in a new issue