Skip to content

Commit

Permalink
Merge pull request #467 from Emantor/fix/pytest_config_deprecation
Browse files Browse the repository at this point in the history
pytestplugin/fixtures: use request.config
  • Loading branch information
jluebbe committed Jul 10, 2019
2 parents 408de42 + 5ea94a2 commit 6ea45bb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions labgrid/pytestplugin/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def env(request):
if not env:
pytest.skip("missing environment config (use --lg-env)")

if pytest.config.pluginmanager.hasplugin('junitxml'):
my_junit = getattr(pytest.config, '_xml', None)
if request.config.pluginmanager.hasplugin('junitxml'):
my_junit = getattr(request.config, '_xml', None)

if my_junit:
my_junit.add_global_property('ENV_CONFIG', env.config_file)
Expand Down

0 comments on commit 6ea45bb

Please sign in to comment.