Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,13 @@ jobs:
include:
- name: Python 3.7 (integration)
python: "3.7"
env: TOXENV=py37-cov
env:
- TOXENV=py37-cov
# Fail on (internal) deprecation warnings.
- PYTEST_ADDOPTS="$PYTEST_ADDOPTS -Werror::DeprecationWarning -Wonce::DeprecationWarning:.*[/\\](_bundles|site-packages)[/\\]"
git:
# Check out vital.vim for test_cli_vital.
submodules: true
- name: Python 2.7
python: "2.7"
env: TOXENV=py27-cov
- name: Python 3.6
python: "3.6"
env: TOXENV=py36-cov
- name: Python 3.5
python: "3.5"
env: TOXENV=py35-cov
- name: Python 3.4
python: "3.4"
env: TOXENV=py34-cov

install:
- pip install tox
Expand Down
11 changes: 1 addition & 10 deletions test/acceptance/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,6 @@


class TestCLI(unittest.TestCase):
def assertRegex(self, string, pattern):
assertRegexpMatches = getattr(self, 'assertRegexpMatches', None)
if assertRegexpMatches:
assertRegexpMatches(string, pattern)
return

super(TestCLI, self).assertRegex(string, pattern)


def assertReturnedStdoutEqual(self, expected_stdout, args):
got_stdout = '(no stdout)'
cmd = [sys.executable, '-m', 'vint'] + args
Expand Down Expand Up @@ -139,7 +130,7 @@ def test_exec_vint_with_color_flag(self):

got_output = context_manager.exception.output

expected_output_pattern = '\\033\['
expected_output_pattern = r'\\033\['
self.assertRegex(got_output, expected_output_pattern)


Expand Down