|  | @@ -17,8 +17,9 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 | 
	
		
			
				|  |  |                  --with-coverage3                                \
 | 
	
		
			
				|  |  |                  --cover3-branch                                 \
 | 
	
		
			
				|  |  |                  --cover3-xml                                    \
 | 
	
		
			
				|  |  | -                --cover3-xml-file=coverage.xml                  \
 | 
	
		
			
				|  |  | +                --cover3-xml-file={toxinidir}/coverage.xml      \
 | 
	
		
			
				|  |  |                  --cover3-html                                   \
 | 
	
		
			
				|  |  | +                --cover3-html-dir={toxinidir}/cover             \
 | 
	
		
			
				|  |  |                  --cover3-package=celery                         \
 | 
	
		
			
				|  |  |                  --cover3-exclude="celery celery.tests.*         \
 | 
	
		
			
				|  |  |                          celery.bin.celeryd_multi                \
 | 
	
	
		
			
				|  | @@ -46,16 +47,18 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 | 
	
		
			
				|  |  |                          celery.events.dumper                    \
 | 
	
		
			
				|  |  |                          celery.events.cursesmon"                \
 | 
	
		
			
				|  |  |                  --with-xunit                                    \
 | 
	
		
			
				|  |  | -                --xunit-file=nosetests.xml
 | 
	
		
			
				|  |  | +                --xunit-file={toxinidir}/nosetests.xml
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  [testenv:py27]
 | 
	
		
			
				|  |  |  basepython = python2.7
 | 
	
		
			
				|  |  |  deps = -r{toxinidir}/requirements/default.txt
 | 
	
		
			
				|  |  |         -r{toxinidir}/requirements/test.txt
 | 
	
		
			
				|  |  |  commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 | 
	
		
			
				|  |  | -           nosetests --with-xunit --xunit-file=nosetests.xml \
 | 
	
		
			
				|  |  | -                     --with-coverage3 --cover3-xml          \
 | 
	
		
			
				|  |  | -                     --cover3-xml-file=coverage.xml
 | 
	
		
			
				|  |  | +           nosetests --with-xunit                               \
 | 
	
		
			
				|  |  | +                     --xunit-file={toxinidir}/nosetests.xml     \
 | 
	
		
			
				|  |  | +                     --with-coverage3 --cover3-xml              \
 | 
	
		
			
				|  |  | +                     --cover3-html-dir={toxinidir}/cover        \
 | 
	
		
			
				|  |  | +                     --cover3-xml-file={toxinidir}/coverage.xml
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  [testenv:py26]
 | 
	
		
			
				|  |  |  basepython = python2.6
 | 
	
	
		
			
				|  | @@ -65,9 +68,11 @@ deps = -r{toxinidir}/requirements/default.txt
 | 
	
		
			
				|  |  |  commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 | 
	
		
			
				|  |  |             pip -E {envdir} install -r contrib/requirements/py26.txt
 | 
	
		
			
				|  |  |             pip -E {envdir} install -r contrib/requirements/test.txt
 | 
	
		
			
				|  |  | -           nosetests --with-xunit --xunit-file=nosetests.xml \
 | 
	
		
			
				|  |  | -                     --with-coverage3 --cover3-xml          \
 | 
	
		
			
				|  |  | -                     --cover3-xml-file=coverage.xml
 | 
	
		
			
				|  |  | +           nosetests --with-xunit                               \
 | 
	
		
			
				|  |  | +                     --xunit-file={toxinidir}/nosetests.xml     \
 | 
	
		
			
				|  |  | +                     --with-coverage3 --cover3-xml              \
 | 
	
		
			
				|  |  | +                     --cover3-html-dir={toxinidir}/cover        \
 | 
	
		
			
				|  |  | +                     --cover3-xml-file={toxinidir}/coverage.xml
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  [testenv:py25]
 | 
	
		
			
				|  |  |  basepython = python2.5
 | 
	
	
		
			
				|  | @@ -75,16 +80,19 @@ deps = -r{toxinidir}/requirements/default.txt
 | 
	
		
			
				|  |  |         -r{toxinidir}/requirements/py25.txt
 | 
	
		
			
				|  |  |         -r{toxinidir}/requirements/test.txt
 | 
	
		
			
				|  |  |  commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 | 
	
		
			
				|  |  | -           nosetests --with-xunit --xunit-file=nosetests.xml \
 | 
	
		
			
				|  |  | -                     --with-coverage3 --cover3-xml          \
 | 
	
		
			
				|  |  | -                     --cover3-xml-file=coverage.xml
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +           nosetests --with-xunit                               \
 | 
	
		
			
				|  |  | +                     --xunit-file={toxinidir}/nosetests.xml     \
 | 
	
		
			
				|  |  | +                     --with-coverage3 --cover3-xml              \
 | 
	
		
			
				|  |  | +                     --cover3-html-dir={toxinidir}/cover        \
 | 
	
		
			
				|  |  | +                     --cover3-xml-file={toxinidir}/coverage.xml
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  [testenv:pypy]
 | 
	
		
			
				|  |  |  basepython = pypy
 | 
	
		
			
				|  |  |  deps = -r{toxinidir}/requirements/default.txt
 | 
	
		
			
				|  |  |         -r{toxinidir}/requirements/test-pypy.txt
 | 
	
		
			
				|  |  |  commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 | 
	
		
			
				|  |  | -           nosetests --with-xunit --xunit-file=nosetests.xml \
 | 
	
		
			
				|  |  | -                     --with-coverage3 --cover3-xml          \
 | 
	
		
			
				|  |  | -                     --cover3-xml-file=coverage.xml
 | 
	
		
			
				|  |  | +           nosetests --with-xunit                               \
 | 
	
		
			
				|  |  | +                     --xunit-file={toxinidir}/nosetests.xml     \
 | 
	
		
			
				|  |  | +                     --with-coverage3 --cover3-xml              \
 | 
	
		
			
				|  |  | +                     --cover3-html-dir={toxinidir}/cover        \
 | 
	
		
			
				|  |  | +                     --cover3-xml-file={toxinidir}/coverage.xml
 |