diff --git a/.travis.yml b/.travis.yml index d82de21e..cf6393f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,18 @@ python: - "3.4" - "3.3" - "2.7" +sudo: true install: - pip install coveralls - pip install -r requirements.txt - python setup.py develop - rm -rf build + - curl -sLo - http://j.mp/install-travis-docker | sh -xe +env: + global: + - DOCKER="./run docker" + - FUNCTIONAL=true script: - export COVERAGE_PYTHON_VERSION=python-${TRAVIS_PYTHON_VERSION:0:1} - - coverage run --source=thefuck,tests -m py.test -v + - coverage run --source=thefuck,tests -m py.test -v --capture=sys after_success: coveralls diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 3b4e18c6..3a3c04ae 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -9,6 +9,7 @@ import pexpect import pytest root = str(Path(__file__).parent.parent.parent.resolve()) +docker = os.environ.get('DOCKER', 'docker').split(' ') def build_container(tag, dockerfile):