diff options
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.py | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/data/opt/plan/doctor.yaml b/tests/data/benchmarks/plan/doctor.yaml index 48b4c955..6c95077b 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 b57bcfb5..32837f8f 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 |