Simplify the test settings. Should leave a .coverage state file for coveralls to pick up now ...

Author: ionelmc

.coveragerc

@@ -0,0 +1,3 @@
+[run]
+parallel = 1
+omit = celery.utils.debug,celery.tests.*,celery.bin.graph

tox.ini

@@ -17,10 +17,9 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install anyjson
-           nosetests -vd celery.tests --with-xunit              \
-                     --xunit-file="{toxinidir}/nosetests.xml"   \
-                     --cover3-html-dir={toxinidir}/cover        \
-                     --cover3-xml-file={toxinidir}/coverage.xml
+           nosetests celery.tests --with-coverage []
+           coverage combine
+           coverage report
 
 [testenv:3.2]
 basepython = python3.2
@@ -29,10 +28,9 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install anyjson
-           nosetests -vd celery.tests --with-xunit              \
-                     --xunit-file="{toxinidir}/nosetests.xml"   \
-                     --cover3-html-dir={toxinidir}/cover        \
-                     --cover3-xml-file={toxinidir}/coverage.xml
+           nosetests celery.tests --with-coverage []
+           coverage combine
+           coverage report
 
 [testenv:2.7]
 basepython = python2.7
@@ -41,11 +39,9 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install anyjson
-           nosetests -v --with-xunit                            \
-                     --xunit-file={toxinidir}/nosetests.xml     \
-                     --with-coverage3 --cover3-xml              \
-                     --cover3-html-dir={toxinidir}/cover        \
-                     --cover3-xml-file={toxinidir}/coverage.xml
+           nosetests --with-coverage []
+           coverage combine
+           coverage report
 
 [testenv:2.6]
 basepython = python2.6
@@ -54,11 +50,9 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install anyjson
-           nosetests -v --with-xunit                            \
-                     --xunit-file={toxinidir}/nosetests.xml     \
-                     --with-coverage3 --cover3-xml              \
-                     --cover3-html-dir={toxinidir}/cover        \
-                     --cover3-xml-file={toxinidir}/coverage.xml
+           nosetests --with-coverage []
+           coverage combine
+           coverage report
 
 [testenv:pypy]
 basepython = pypy
@@ -67,8 +61,6 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            pip install anyjson
-           nosetests -v --with-xunit                            \
-                     --xunit-file={toxinidir}/nosetests.xml     \
-                     --with-coverage3 --cover3-xml              \
-                     --cover3-html-dir={toxinidir}/cover        \
-                     --cover3-xml-file={toxinidir}/coverage.xml
+           nosetests --with-coverage []
+           coverage combine
+           coverage report