diff --git a/.gitignore b/.gitignore index a2698cd37..de86bb326 100644 --- a/.gitignore +++ b/.gitignore @@ -3,14 +3,10 @@ *.pyc *~ .*.kate-swp +.coverage .DS_Store .installed.cfg .mr.developer.cfg -library-settings.txt -log.html -output.xml -report.html -selenium* .project .pydevproject .settings/ @@ -19,10 +15,18 @@ coverage/ develop-eggs/ downloads/ eggs/ +htmlcov/ include/ lib/ +library-settings.txt local.cfg +log.html +Makefile +node_modules +output.xml parts/ +report.html +selenium* src/plone.app.blocks/ src/plone.app.deco/ src/plone.app.imaging/ @@ -32,5 +36,3 @@ src/plone.app.tiles/ src/plone.scale/ src/plone.tiles/ var/ -Makefile -node_modules diff --git a/.travis.yml b/.travis.yml index f3730cd06..c2ffdca43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start script: bin/test -after_success: test -v QA && make coverage-validation basic-validation || true +after_success: + - test -v QA && bin/buildout -c coverage.cfg -N -q -t 3 || true + - test -v QA && make coverage-validation basic-validation || true notifications: irc: irc.freenode.org#simplesconsultoria diff --git a/coverage.cfg b/coverage.cfg new file mode 100644 index 000000000..2cba87c15 --- /dev/null +++ b/coverage.cfg @@ -0,0 +1,22 @@ +[buildout] +extends = + https://raw.github.com/collective/buildout.plonetest/master/travis-4.3.x.cfg + https://raw.github.com/hvelarde/qa/master/tools.cfg + versions.cfg + +package-name = collective.cover +package-extras = [test] +package-minimum-test-coverage = 75 + +allow-hosts += + code.google.com + robotframework.googlecode.com + +[test] +recipe = zc.recipe.testrunner +defaults = ['-s', '${buildout:package-name}', '--layer=Integration', '--quiet'] +eggs = + Plone + plone.app.upgrade + ${buildout:package-name} ${buildout:package-extras} + ${buildout:test-eggs} diff --git a/travis.cfg b/travis.cfg index 9c27d4b2a..07cc6d648 100644 --- a/travis.cfg +++ b/travis.cfg @@ -1,12 +1,10 @@ [buildout] extends = https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg - https://raw.github.com/hvelarde/qa/master/tools.cfg versions.cfg package-name = collective.cover package-extras = [test] -package-minimum-test-coverage = 75 allow-hosts += code.google.com