summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml9
-rw-r--r--tox.ini11
2 files changed, 20 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 27cd7f1..5bce766 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,19 @@
+sudo: required
+services:
+ - docker
+
language: python
python: 2.7
env:
- TOX_ENV=py34
- TOX_ENV=py27
- TOX_ENV=pep8
+ - TOX_ENV=docs
+ - TOX_ENV=noop_py
+ - TOX_ENV=noop_cli
install:
- pip install tox
script:
- tox -e $TOX_ENV
+after_success:
+ if [ "$TOX_ENV" = "noop_py" ]; then ./tools/py_functional_tests.sh; elif [ "$TOX_ENV" = "noop_cli" ]; then ./tools/functional_tests.sh; fi
diff --git a/tox.ini b/tox.ini
index b7e0d2f..89b4f9b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist = py35,py34,py27,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
+whitelist_externals = true
usedevelop = True
install_command = pip install {opts} {packages}
@@ -30,3 +31,13 @@ commands = python setup.py build_sphinx
[testenv:cover]
commands =
python setup.py testr --slowest --coverage --testr-args="{posargs}"
+
+[testenv:noop_cli]
+usedevelop = True
+install_command = true {opts} {packages}
+commands = true
+
+[testenv:noop_py]
+usedevelop = True
+install_command = true {opts} {packages}
+commands = true