aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-01-19 16:58:46 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-01-29 20:34:56 +0800
commitf2d021c72b38845954755bab54aa13b4b2aad725 (patch)
tree384b0aa7772facb1e8f836a4741f8151ef119901 /tests
parenta42b9a6ac576b11403955ff38df6cc58cf02abb7 (diff)
Refactor loader classes
- rename BaseLoader to YamlFileLoader as base class of QTIP specs loader - create an abstract BaseLoader - create FileLoader for logfile collector Change-Id: I0c992cd847fc0dce4fdd73a13c1cdbc406c84532 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'tests')
-rw-r--r--tests/data/benchmarks/plan/doctor.yaml (renamed from tests/data/opt/plan/doctor.yaml)16
-rw-r--r--tests/unit/loader/plan_test.py2
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/data/opt/plan/doctor.yaml b/tests/data/benchmarks/plan/doctor.yaml
index 48b4c95..6c95077 100644
--- a/tests/data/opt/plan/doctor.yaml
+++ b/tests/data/benchmarks/plan/doctor.yaml
@@ -10,24 +10,24 @@ config:
logs:
- filename: doctor_consumer.log
# 2016-12-28 03:16:05,630 consumer.py 26 INFO doctor consumer notified at 1482894965.63
- patterns:
- - match: 'doctor consumer notified at \d+(\.\d+)?$'
+ grep:
+ - regex: 'doctor consumer notified at \d+(\.\d+)?$'
capture: notified consumer
- filename: doctor_inspector.log
# 2016-12-28 03:16:05,299 inspector.py 76 INFO event posted at 1482894965.3
# 2016-12-28 03:16:05,299 inspector.py 56 INFO doctor mark vm(<Server: doctor_vm1>) error at 1482894965.3
# 2016-12-28 03:16:05,506 inspector.py 66 INFO doctor mark host(overcloud-novacompute-1.ool-virtual1) down at 1482894965.51
- patterns:
- - match: 'event posted at \d+(\.\d+)?$'
+ grep:
+ - regex: 'event posted at \d+(\.\d+)?$'
capture: posted event
- - match: 'doctor mark vm\(.*\) error at \d+(\.\d+)?$'
+ - regex: 'doctor mark vm\(.*\) error at \d+(\.\d+)?$'
capture: marked VM error
- - match: 'doctor mark host\(.*\) down at \d+(\.\d+)?$'
+ - regex: 'doctor mark host\(.*\) down at \d+(\.\d+)?$'
capture: marked host down
- filename: disable_network.log
# doctor set host down at 1482894965.164096803
- patterns:
- - match: 'doctor set host down at \d+(\.\d+)?$'
+ grep:
+ - regex: 'doctor set host down at \d+(\.\d+)?$'
capture: set host down
reporter:
name: console
diff --git a/tests/unit/loader/plan_test.py b/tests/unit/loader/plan_test.py
index b57bcfb..32837f8 100644
--- a/tests/unit/loader/plan_test.py
+++ b/tests/unit/loader/plan_test.py
@@ -27,7 +27,7 @@ def test_init(plan):
def test_list_all(benchmarks_root):
plan_list = Plan.list_all(paths=[benchmarks_root])
- assert len(list(plan_list)) is 1
+ assert len(list(plan_list)) is 2
for desc in plan_list:
assert PlanProp.NAME in desc
assert PlanProp.CONTENT in desc