diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2019-06-02 21:13:45 -0500 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-06-02 22:13:45 -0400 |
commit | 38ce1fac552525c08621d1cc5410cd20cfddfd82 (patch) | |
tree | 352dc8c2f7ab2a517251b4b9ea519cd8f30ab4de | |
parent | 75b4eaac47bc13f68a4838219f095ebf6d416eaf (diff) | |
download | cryptography-38ce1fac552525c08621d1cc5410cd20cfddfd82.tar.gz cryptography-38ce1fac552525c08621d1cc5410cd20cfddfd82.tar.bz2 cryptography-38ce1fac552525c08621d1cc5410cd20cfddfd82.zip |
Simplify how we define random order tests in tox (#4912)
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | tox.ini | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index bf1f01e6..5c0aa194 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,7 @@ matrix: env: TOXENV=py37 DOCKER=pyca/cryptography-runner-ubuntu-rolling - python: 2.7 services: docker - env: TOXENV=randomorder DOCKER=pyca/cryptography-runner-ubuntu-rolling + env: TOXENV=py27-randomorder DOCKER=pyca/cryptography-runner-ubuntu-rolling - python: 2.7 services: docker env: TOXENV=py27 DOCKER=pyca/cryptography-runner-fedora @@ -4,8 +4,9 @@ envlist = py27,pypy,py34,py35,py36,py37,docs,pep8,packaging [testenv] extras = - test - idna: idna + test + idna: idna + randomorder: pytest-random deps = # This must be kept in sync with .travis/install.sh and azure-pipelines.yml coverage @@ -64,13 +65,6 @@ extras = commands = flake8 . -[testenv:randomorder] -deps = - {[testenv]deps} - pytest-randomly -commands = - pytest --capture=no --strict {posargs} - [testenv:packaging] deps = check-manifest |