summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Iversen <teh.ivo@gmail.com>2016-01-22 21:33:16 +1100
committerMatthew Iversen <teh.ivo@gmail.com>2016-01-22 21:33:16 +1100
commit352dcef7d9bdab298c4315bad1da564dd76901a5 (patch)
tree1a4de21df51cb4f52de909137ada6349d67ff4e0
parent5c3fd0d67c2c92de94bcc9162b33305b9e5d7cb1 (diff)
downloadvirtualenv-test-virtualenv-more.tar.gz
Test more virtualenv invocationstest-virtualenv-more
- with no arguments - with --python=<fullpath> - with -p <binary> Also test creating a {2,3}-based venv with python {3,2}
-rw-r--r--.travis.yml14
-rw-r--r--tox.ini26
2 files changed, 32 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index b89e5d8..8124e88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,19 +3,23 @@ language: python
matrix:
include:
- python: 2.6
- env: TOXENV=py26
+ env: TOXENV=python2.6
- python: 2.7
- env: TOXENV=py27
+ env: TOXENV=python2.7
- python: 3.3
- env: TOXENV=py33
+ env: TOXENV=python3.3
- python: 3.4
- env: TOXENV=py34
+ env: TOXENV=python3.4
- python: 3.5
- env: TOXENV=py35
+ env: TOXENV=python3.5
- python: pypy
env: TOXENV=pypy
- python: pypy3
env: TOXENV=pypy3
+ - python: 3.5
+ env: TOXENV=crosspython3
+ - python: 2.7
+ env: TOXENV=crosspython2
- python: 2.7
env: TOXENV=docs
diff --git a/tox.ini b/tox.ini
index 10a738c..e865b2d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,34 @@
[tox]
+# env names must be a valid python binary name, unless they have a
+# separate configuration
envlist =
- py26, py27, py32, py33, py34, py35, pypy, pypy3, docs
+ python{2.6,2.7,3.3,3.4,3.5}, pypy{,3}, crosspython{2,3}, docs
[testenv]
deps =
mock
pytest
commands =
- py.test []
- python virtualenv.py {envtmpdir}/test-venv-01
+ py.test
+ python virtualenv.py {envtmpdir}/venv
+ python virtualenv.py -p {envname} {envtmpdir}/{envname}
+ python virtualenv.py --python={envpython} {envtmpdir}/{envname}-fullpath
+
+# Creating a python3 venv with a python2-based virtualenv
+[testenv:crosspython2]
+basepython=python2
+deps =
+commands =
+ virtualenv -p python3 {envtmpdir}/{envname}
+ {envtmpdir}/{envname}/bin/python -V 2>&1 | grep "Python 3"
+
+# Creating a python2 venv with a python3-based virtualenv
+[testenv:crosspython3]
+basepython=python3
+deps =
+commands =
+ virtualenv -p python2 {envtmpdir}/{envname}
+ {envtmpdir}/{envname}/bin/python -V 2>&1 | grep "Python 2"
[testenv:docs]
deps =