From 683831e33bab86dd1f8d6844f7fa2aec5e12b171 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 26 Jul 2017 14:30:28 +0800 Subject: Deprecate plan and metric loader - qtip test plan is now automaticlly generated by `qtip create`. The original way of loading plans is no longer valid - metric specs are now embedded in qpi spec, no separated loader are required now JIRA: QTIP-258 Change-Id: I768d75b014163ce060faff00f415a1cdc437ce73 Signed-off-by: Yujun Zhang --- tests/conftest.py | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index ddec94b8..8e812d66 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -11,9 +11,6 @@ from os import path import pytest -from qtip.loader.plan import Plan -from qtip.loader.plan import PlanProp - @pytest.fixture(scope='session') def data_root(): @@ -25,26 +22,6 @@ def benchmarks_root(data_root): return path.join(data_root, 'benchmarks') -@pytest.fixture(scope='session') -def plan(benchmarks_root): - return Plan('doctor.yaml', [benchmarks_root]) - - -@pytest.fixture(scope='session') -def plan_config(plan): - return plan.content[PlanProp.CONFIG] - - -@pytest.fixture(scope='session') -def collectors_config(plan_config): - return plan_config[PlanProp.COLLECTORS] - - -@pytest.fixture(scope='session') -def logfile_config(collectors_config): - return collectors_config[0] - - @pytest.fixture(scope='session') def metrics(): return { -- cgit 1.2.3-korg