Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run pytest with dedicated pytest.ini. #59842

Merged
merged 3 commits into from
Jul 31, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions test/runner/lib/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -1355,6 +1355,8 @@ def command_units(args):
'-n', str(args.num_workers) if args.num_workers else 'auto',
'--color',
'yes' if args.color else 'no',
'-p', 'no:cacheprovider',
'-c', os.path.join(ANSIBLE_ROOT, 'test/runner/pytest.ini'),
'--junit-xml',
'test/results/junit/python%s-units.xml' % version,
]
Expand Down
3 changes: 3 additions & 0 deletions test/runner/pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[pytest]
xfail_strict = true
mock_use_standalone_module = true
5 changes: 0 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ passenv =
# variable error. See issue: #20424
HOME

[pytest]
xfail_strict = true
cache_dir = .pytest_cache
mock_use_standalone_module = true

[flake8]
# These are things that the devs don't agree make the code more readable
# E402 module level import not at top of file
Expand Down