Merge pull request #1295 from romanz/master

travis: use pytest (due to better test discovery)
2015-06-13 14:05:09 +02:00 · 2015-06-13 14:05:09 +02:00 · cf5d3e956b
parent 12feb4cf9c d27efaad82
commit cf5d3e956b
1 changed files with 1 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -3,4 +3,4 @@ language: python
 python:
    - "2.7"
 install: "pip install slowaes==0.1a1 ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode SocksiPy-branch protobuf"
-script: nosetests -e gui -e plugins
+script: py.test -v