From 60167eb33480c8564925b7f50e78f8b2c1e522a9 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Mon, 22 Aug 2016 16:13:05 +0300 Subject: [PATCH] Fix pytest import FixtureManager has been moved from _pytest.python to _pytest.fixtures Change-Id: I5cde09607b0af47f75916d959eb05216488a0d24 --- fuelweb_test/testrail/upload_cases_description.py | 2 +- run_system_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fuelweb_test/testrail/upload_cases_description.py b/fuelweb_test/testrail/upload_cases_description.py index 47a5a661c..328148f90 100644 --- a/fuelweb_test/testrail/upload_cases_description.py +++ b/fuelweb_test/testrail/upload_cases_description.py @@ -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' diff --git a/run_system_test.py b/run_system_test.py index f98ae269a..36e1b0ab1 100755 --- a/run_system_test.py +++ b/run_system_test.py @@ -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)