From 0f3ad6f2db26fb91190e47c89f77fb59b7601b84 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 9 Feb 2017 10:12:39 +0800 Subject: Refactoring collector initialization in plan loader - move ClassProps to module - collectors should be array in plan definition Change-Id: I37d85dbc977c91aa1bb81de45b5e1c41660e6d1f Signed-off-by: Yujun Zhang --- tests/data/benchmarks/plan/doctor.yaml | 4 ++-- tests/data/benchmarks/plan/fake-plan.yaml | 2 +- tests/unit/loader/plan_test.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/data/benchmarks/plan/doctor.yaml b/tests/data/benchmarks/plan/doctor.yaml index 6c95077b..f884c606 100644 --- a/tests/data/benchmarks/plan/doctor.yaml +++ b/tests/data/benchmarks/plan/doctor.yaml @@ -5,8 +5,8 @@ info: engineer: local config: driver: sample - collector: - - name: logfile + collectors: + - type: logfile logs: - filename: doctor_consumer.log # 2016-12-28 03:16:05,630 consumer.py 26 INFO doctor consumer notified at 1482894965.63 diff --git a/tests/data/benchmarks/plan/fake-plan.yaml b/tests/data/benchmarks/plan/fake-plan.yaml index 8887f66d..511affd6 100644 --- a/tests/data/benchmarks/plan/fake-plan.yaml +++ b/tests/data/benchmarks/plan/fake-plan.yaml @@ -4,7 +4,7 @@ config: facility: local engineer: local driver: sample - collector: logfile + collectors: [] reporter: console QPIs: - fake-qpi.yaml diff --git a/tests/unit/loader/plan_test.py b/tests/unit/loader/plan_test.py index 32837f8f..81fd0bd3 100644 --- a/tests/unit/loader/plan_test.py +++ b/tests/unit/loader/plan_test.py @@ -9,8 +9,9 @@ import pytest -from qtip.base.constant import PlanProp -from qtip.loader.plan import Plan, QPISpec +from qtip.loader.plan import Plan +from qtip.loader.plan import PlanProp +from qtip.loader.plan import QPISpec def test_init(plan): -- cgit 1.2.3-korg