diff options
author | zhihui wu <wu.zhihui1@zte.com.cn> | 2017-07-27 06:41:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-07-27 06:41:16 +0000 |
commit | e3e6e3287cd6db05bf5471b01838cc52549a7a8c (patch) | |
tree | 32d0d1294df34cc1fab3576f196646ef20d40136 /tests/conftest.py | |
parent | 60767a6183855295d64ee131843c43a35948fa5b (diff) | |
parent | 683831e33bab86dd1f8d6844f7fa2aec5e12b171 (diff) |
Merge "Deprecate plan and metric loader"
Diffstat (limited to 'tests/conftest.py')
-rw-r--r-- | tests/conftest.py | 23 |
1 files changed, 0 insertions, 23 deletions
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(): @@ -26,26 +23,6 @@ def benchmarks_root(data_root): @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 { "ssl_rsa": { |