Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix for datasource field value"
[yardstick.git]
/
yardstick
/
benchmark
/
core
/
testcase.py
diff --git
a/yardstick/benchmark/core/testcase.py
b/yardstick/benchmark/core/testcase.py
index
7b23b73
..
5013567
100644
(file)
--- a/
yardstick/benchmark/core/testcase.py
+++ b/
yardstick/benchmark/core/testcase.py
@@
-12,11
+12,11
@@
from __future__ import absolute_import
from __future__ import print_function
import os
from __future__ import print_function
import os
-import yaml
import logging
from yardstick.common.task_template import TaskTemplate
from yardstick.common import constants as consts
import logging
from yardstick.common.task_template import TaskTemplate
from yardstick.common import constants as consts
+from yardstick.common.yaml_loader import yaml_load
LOG = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
@@
-69,7
+69,7
@@
class Testcase(object):
def _parse_testcase(self, testcase_info):
rendered_testcase = TaskTemplate.render(testcase_info)
def _parse_testcase(self, testcase_info):
rendered_testcase = TaskTemplate.render(testcase_info)
- testcase_cfg = yaml
.
load(rendered_testcase)
+ testcase_cfg = yaml
_
load(rendered_testcase)
test_precondition = testcase_cfg.get('precondition', {})
installer_type = test_precondition.get('installer_type', 'all')
test_precondition = testcase_cfg.get('precondition', {})
installer_type = test_precondition.get('installer_type', 'all')