From 41350d13a87e77657c895fdf0c43937eedf22be5 Mon Sep 17 00:00:00 2001 From: nvbn Date: Fri, 24 Jul 2015 23:31:21 +0300 Subject: [PATCH] Revert "#N/A Run functional tests in travis-ci" This reverts commit 9e79c4aea3d1886dcd495508e79d8581b3527ddf. --- .travis.yml | 8 +------- tests/functional/utils.py | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf6393f4..d82de21e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,18 +3,12 @@ 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 --capture=sys + - coverage run --source=thefuck,tests -m py.test -v after_success: coveralls diff --git a/tests/functional/utils.py b/tests/functional/utils.py index 3a3c04ae..3b4e18c6 100644 --- a/tests/functional/utils.py +++ b/tests/functional/utils.py @@ -9,7 +9,6 @@ import pexpect import pytest root = str(Path(__file__).parent.parent.parent.resolve()) -docker = os.environ.get('DOCKER', 'docker').split(' ') def build_container(tag, dockerfile):