From 87f0930d4e11c57246e418feee4a4b00d9d27408 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Fri, 21 Sep 2018 14:23:31 -0400 Subject: [PATCH] MAINT: Remove old if statement that's always True --- test/test_python.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/test/test_python.py b/test/test_python.py index 93721a49c..580fcf173 100644 --- a/test/test_python.py +++ b/test/test_python.py @@ -1,4 +1,3 @@ -import os from pathlib import Path import time @@ -357,22 +356,21 @@ def pytest_generate_tests(metafunc): if 'python_test' in metafunc.fixturenames: test_modules = [] test_modules_ids = [] - if 'CIRCLECI' not in os.environ or True: - with open( - Path(__file__).parent / "python_tests.txt") as fp: - for line in fp: - line = line.strip() - if line.startswith('#') or not line: - continue - error_flags = line.split() - name = error_flags.pop(0) - if (not error_flags - or set(error_flags).intersection( - {'crash', 'crash-chrome', 'crash-firefox'})): - test_modules.append((name, error_flags)) - # explicitly define test ids to keep - # a human readable test name in pytest - test_modules_ids.append(name) + with open( + Path(__file__).parent / "python_tests.txt") as fp: + for line in fp: + line = line.strip() + if line.startswith('#') or not line: + continue + error_flags = line.split() + name = error_flags.pop(0) + if (not error_flags + or set(error_flags).intersection( + {'crash', 'crash-chrome', 'crash-firefox'})): + test_modules.append((name, error_flags)) + # explicitly define test ids to keep + # a human readable test name in pytest + test_modules_ids.append(name) metafunc.parametrize("python_test", test_modules, ids=test_modules_ids)