jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove merge artifact

This commit is contained in:
Anatoly Bubenkov 2015-07-19 15:49:43 +02:00
parent 6af7172204
commit 045274e647
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tox.ini
View File

@ -19,7 +19,6 @@ deps=
nose nose
mock<1.1 # last supported version for py26 mock<1.1 # last supported version for py26
<<<<<<< HEAD
[testenv:py27-subprocess] [testenv:py27-subprocess]
changedir=. changedir=.
basepython=python2.7 basepython=python2.7
@ -29,8 +28,6 @@ deps=pytest-xdist
commands= commands=
py.test -n3 -rfsxX --runpytest=subprocess {posargs:testing} py.test -n3 -rfsxX --runpytest=subprocess {posargs:testing}
=======
>>>>>>> pytest-2.7
[testenv:genscript] [testenv:genscript]
commands= py.test --genscript=pytest1 commands= py.test --genscript=pytest1
@ -80,7 +77,7 @@ commands=
[testenv:py34-trial] [testenv:py34-trial]
# py34-trial does not work # py34-trial does not work
platform=linux|darwin platform=linux|darwin
deps={[testenv:py27-trial]deps} deps={[testenv:py27-trial]deps}
commands= commands=
py.test -rsxf {posargs:testing/test_unittest.py} py.test -rsxf {posargs:testing/test_unittest.py}
@ -126,7 +123,7 @@ commands=
{envpython} install_cx_freeze.py {envpython} install_cx_freeze.py
{envpython} runtests_setup.py build --build-exe build {envpython} runtests_setup.py build --build-exe build
{envpython} tox_run.py {envpython} tox_run.py
[testenv:coveralls] [testenv:coveralls]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH