summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Leonhardt <todd.leonhardt@gmail.com>2017-07-02 21:09:07 -0400
committerGitHub <noreply@github.com>2017-07-02 21:09:07 -0400
commit7dd5db1761d3e223e87652cadcab8226d5418cd5 (patch)
tree1a8397c8bb24b3446f9570dc2f335932f6819e97
parent29578bee1857f9c672ab2bc60f47a1d02d889577 (diff)
parenta89b392489c6f7d2dd5481446dc7de8651f2978f (diff)
downloadcmd2-git-7dd5db1761d3e223e87652cadcab8226d5418cd5.tar.gz
Merge pull request #166 from python-cmd2/speedup_tests
Speedup tests
-rw-r--r--.appveyor.yml2
-rw-r--r--.travis.yml6
-rw-r--r--tox.ini70
3 files changed, 71 insertions, 7 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index bfac7f07..c397472f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,4 +4,4 @@ install:
build: off
test_script:
- - python -m tox -e py27,py34,py35,py36
+ - python -m tox -e py27,py35,py36-win
diff --git a/.travis.yml b/.travis.yml
index 5deb0667..3afcb263 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,9 @@ matrix:
- os: linux
python: 3.6
env: TOXENV=py36
- - os: linux
- python: 3.7-dev
- env: TOXENV=py37
+# - os: linux
+# python: 3.7-dev
+# env: TOXENV=py37
# # Warning: Don't try to use code coverage analysis with pypy as it is insanely slow
# - os: linux
# python: pypy
diff --git a/tox.ini b/tox.ini
index 6dd6f08e..946f2136 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,10 @@
[tox]
-envlist = py27,py34,py35,py36,jython,pypy
+envlist = py27,py33,py34,py35,py36,py36-winpy37,pypy
[testenv]
passenv = CI TRAVIS TRAVIS_* APPVEYOR*
+
+[testenv:py27]
deps =
codecov
mock
@@ -11,8 +13,70 @@ deps =
pytest
pytest-cov
six
-commands=
+commands =
py.test -v --cov=cmd2 --basetemp={envtmpdir} {posargs}
- {envpython} examples/example.py --test examples/exampleSession.txt
codecov
+[testenv:py33]
+deps =
+ mock
+ pyparsing
+ pyperclip
+ pytest
+ pytest-xdist
+ six
+commands = py.test -v -n2
+
+[testenv:py34]
+deps =
+ mock
+ pyparsing
+ pyperclip
+ pytest
+ pytest-xdist
+ six
+commands = py.test -v -n2
+
+[testenv:py35]
+deps =
+ mock
+ pyparsing
+ pyperclip
+ pytest
+ pytest-xdist
+ six
+commands = py.test -v -n2
+
+[testenv:py36]
+deps =
+ codecov
+ mock
+ pyparsing
+ pyperclip
+ pytest
+ pytest-cov
+ six
+commands =
+ py.test -v --cov=cmd2 --basetemp={envtmpdir} {posargs}
+ codecov
+
+[testenv:py36-win]
+deps =
+ mock
+ pyparsing
+ pyperclip
+ pytest
+ pytest-xdist
+ six
+commands = py.test -v -n2
+
+[testenv:py37]
+deps =
+ mock
+ pyparsing
+ pyperclip
+ pytest
+ pytest-xdist
+ six
+commands = py.test -v -n2
+