Commit dda6557b authored by Roman Yurchak's avatar Roman Yurchak Committed by GitHub

Merge pull request #185 from mdboom/remove-old-if

MAINT: Remove old if statement that's always True
parents 18f28a93 87f0930d
import os
from pathlib import Path from pathlib import Path
import time import time
...@@ -357,22 +356,21 @@ def pytest_generate_tests(metafunc): ...@@ -357,22 +356,21 @@ def pytest_generate_tests(metafunc):
if 'python_test' in metafunc.fixturenames: if 'python_test' in metafunc.fixturenames:
test_modules = [] test_modules = []
test_modules_ids = [] test_modules_ids = []
if 'CIRCLECI' not in os.environ or True: with open(
with open( Path(__file__).parent / "python_tests.txt") as fp:
Path(__file__).parent / "python_tests.txt") as fp: for line in fp:
for line in fp: line = line.strip()
line = line.strip() if line.startswith('#') or not line:
if line.startswith('#') or not line: continue
continue error_flags = line.split()
error_flags = line.split() name = error_flags.pop(0)
name = error_flags.pop(0) if (not error_flags
if (not error_flags or set(error_flags).intersection(
or set(error_flags).intersection( {'crash', 'crash-chrome', 'crash-firefox'})):
{'crash', 'crash-chrome', 'crash-firefox'})): test_modules.append((name, error_flags))
test_modules.append((name, error_flags)) # explicitly define test ids to keep
# explicitly define test ids to keep # a human readable test name in pytest
# a human readable test name in pytest test_modules_ids.append(name)
test_modules_ids.append(name)
metafunc.parametrize("python_test", test_modules, metafunc.parametrize("python_test", test_modules,
ids=test_modules_ids) ids=test_modules_ids)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment