Merge pull request #1295 from romanz/master
travis: use pytest (due to better test discovery)
This commit is contained in:
commit
cf5d3e956b
|
@ -3,4 +3,4 @@ language: python
|
||||||
python:
|
python:
|
||||||
- "2.7"
|
- "2.7"
|
||||||
install: "pip install slowaes==0.1a1 ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode SocksiPy-branch protobuf"
|
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
|
||||||
|
|
Loading…
Reference in New Issue