Fix pytest import
FixtureManager has been moved from _pytest.python to _pytest.fixtures Change-Id: I5cde09607b0af47f75916d959eb05216488a0d24
This commit is contained in:
parent
5420ffb285
commit
60167eb334
|
@ -40,7 +40,7 @@ from system_test.tests.base import ActionTest
|
||||||
from pytest import Session
|
from pytest import Session
|
||||||
# pylint: enable=no-name-in-module
|
# pylint: enable=no-name-in-module
|
||||||
from _pytest.config import _prepareconfig
|
from _pytest.config import _prepareconfig
|
||||||
from _pytest.python import FixtureManager
|
from _pytest.fixtures import FixtureManager
|
||||||
from _pytest.mark import MarkMapping
|
from _pytest.mark import MarkMapping
|
||||||
|
|
||||||
GROUP_FIELD = 'custom_test_group'
|
GROUP_FIELD = 'custom_test_group'
|
||||||
|
|
|
@ -61,7 +61,7 @@ def clean_argv_proboscis():
|
||||||
def group_in_pytest(group):
|
def group_in_pytest(group):
|
||||||
from _pytest.config import _prepareconfig
|
from _pytest.config import _prepareconfig
|
||||||
from _pytest.main import Session
|
from _pytest.main import Session
|
||||||
from _pytest.python import FixtureManager
|
from _pytest.fixtures import FixtureManager
|
||||||
from _pytest.mark import MarkMapping
|
from _pytest.mark import MarkMapping
|
||||||
config = _prepareconfig(args="")
|
config = _prepareconfig(args="")
|
||||||
session = Session(config)
|
session = Session(config)
|
||||||
|
|
Loading…
Reference in New Issue