From 52ff4176ed863f8bf25c78213c80dc6dc54e463a Mon Sep 17 00:00:00 2001 From: David Halter Date: Thu, 22 Aug 2013 22:12:14 +0430 Subject: [PATCH] fix a few problems with conftest --- conftest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conftest.py b/conftest.py index 614f54a..1f92fda 100644 --- a/conftest.py +++ b/conftest.py @@ -16,7 +16,7 @@ class IntegrationTestFile(object): def run(self): output = subprocess.check_output([VSPEC_RUNNER, VSPEC_FOLDER, self.path]) for line in output.splitlines(): - if line.startswith('not ok'): + if line.startswith('not ok') or line.startswith('Error'): print(output) assert False @@ -52,6 +52,7 @@ def pytest_generate_tests(metafunc): """ def collect_tests(): for f in os.listdir(TEST_DIR): - yield IntegrationTestFile(os.path.join(TEST_DIR, f)) + if f.endswith('.vim'): + yield IntegrationTestFile(os.path.join(TEST_DIR, f)) metafunc.parametrize('case', list(collect_tests()))