Fix pytest import

FixtureManager has been moved from _pytest.python to _pytest.fixtures

Change-Id: I5cde09607b0af47f75916d959eb05216488a0d24
This commit is contained in:
Alexey Stepanov 2016-08-22 16:13:05 +03:00
parent 5420ffb285
commit 60167eb334
2 changed files with 2 additions and 2 deletions

View File

@ -40,7 +40,7 @@ from system_test.tests.base import ActionTest
from pytest import Session
# pylint: enable=no-name-in-module
from _pytest.config import _prepareconfig
from _pytest.python import FixtureManager
from _pytest.fixtures import FixtureManager
from _pytest.mark import MarkMapping
GROUP_FIELD = 'custom_test_group'

View File

@ -61,7 +61,7 @@ def clean_argv_proboscis():
def group_in_pytest(group):
from _pytest.config import _prepareconfig
from _pytest.main import Session
from _pytest.python import FixtureManager
from _pytest.fixtures import FixtureManager
from _pytest.mark import MarkMapping
config = _prepareconfig(args="")
session = Session(config)