summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--tox.ini2
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 76eb1985..82d194f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,9 @@ language: python
python:
- "3.5" # Python 3.5 still needs to be installed on Travis-CI
+services:
+ - docker
+
env:
- TOX_ENV=py27
- TOX_ENV=py34
@@ -12,10 +15,9 @@ env:
install:
- pip install tox coveralls
+sudo: required
script:
- NOSE_VERBOSE=0 tox -e $TOX_ENV
after_success:
- coveralls
-
-sudo: false
diff --git a/tox.ini b/tox.ini
index 321b7062..ae9fd330 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,8 @@ usedevelop = True
passenv= NOSE_VERBOSE
commands =
coverage run --source=ryu ryu/tests/run_tests.py '{posargs}'
+ bash ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
+ python ryu/tests/integrated/run_test.py
[testenv:pep8]
commands =