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 "Separate out test_parse_to_value_exception()"
[yardstick.git]
/
yardstick
/
tests
/
unit
/
benchmark
/
core
/
test_task.py
diff --git
a/yardstick/tests/unit/benchmark/core/test_task.py
b/yardstick/tests/unit/benchmark/core/test_task.py
index
0424c77
..
e1414c2
100644
(file)
--- a/
yardstick/tests/unit/benchmark/core/test_task.py
+++ b/
yardstick/tests/unit/benchmark/core/test_task.py
@@
-9,11
+9,13
@@
import copy
import io
import copy
import io
+import logging
import os
import sys
import mock
import six
import os
import sys
import mock
import six
+from six.moves import builtins
import unittest
import uuid
import unittest
import uuid
@@
-28,7
+30,7
@@
from yardstick.common import utils
class TaskTestCase(unittest.TestCase):
class TaskTestCase(unittest.TestCase):
- @mock.patch.object(
task
, 'Context')
+ @mock.patch.object(
base
, 'Context')
def test_parse_nodes_with_context_same_context(self, mock_context):
scenario_cfg = {
"nodes": {
def test_parse_nodes_with_context_same_context(self, mock_context):
scenario_cfg = {
"nodes": {
@@
-69,7
+71,7
@@
class TaskTestCase(unittest.TestCase):
dispatcher2])
self.assertIsNone(t._do_output(output_config, {}))
dispatcher2])
self.assertIsNone(t._do_output(output_config, {}))
- @mock.patch.object(
task
, 'Context')
+ @mock.patch.object(
base
, 'Context')
def test_parse_networks_from_nodes(self, mock_context):
nodes = {
'node1': {
def test_parse_networks_from_nodes(self, mock_context):
nodes = {
'node1': {
@@
-133,7
+135,7
@@
class TaskTestCase(unittest.TestCase):
self.assertEqual(mock_context.get_network.call_count, expected_get_network_calls)
self.assertDictEqual(networks, expected)
self.assertEqual(mock_context.get_network.call_count, expected_get_network_calls)
self.assertDictEqual(networks, expected)
- @mock.patch.object(
task
, 'Context')
+ @mock.patch.object(
base
, 'Context')
@mock.patch.object(task, 'base_runner')
def test_run(self, mock_base_runner, *args):
scenario = {
@mock.patch.object(task, 'base_runner')
def test_run(self, mock_base_runner, *args):
scenario = {
@@
-156,7
+158,7
@@
class TaskTestCase(unittest.TestCase):
t._run([scenario], False, "yardstick.out")
runner.run.assert_called_once()
t._run([scenario], False, "yardstick.out")
runner.run.assert_called_once()
- @mock.patch.object(
task
, 'Context')
+ @mock.patch.object(
base
, 'Context')
@mock.patch.object(task, 'base_runner')
def test_run_ProxDuration(self, mock_base_runner, *args):
scenario = {
@mock.patch.object(task, 'base_runner')
def test_run_ProxDuration(self, mock_base_runner, *args):
scenario = {
@@
-322,9
+324,9
@@
class TaskTestCase(unittest.TestCase):
actual_result = t._parse_options(options)
self.assertEqual(expected_result, actual_result)
actual_result = t._parse_options(options)
self.assertEqual(expected_result, actual_result)
- @mock.patch
('six.moves.builtins.
open', side_effect=mock.mock_open())
+ @mock.patch
.object(builtins, '
open', side_effect=mock.mock_open())
@mock.patch.object(task, 'utils')
@mock.patch.object(task, 'utils')
- @mock.patch
('logging.
root')
+ @mock.patch
.object(logging, '
root')
def test_set_log(self, mock_logging_root, *args):
task_obj = task.Task()
task_obj.task_id = 'task_id'
def test_set_log(self, mock_logging_root, *args):
task_obj = task.Task()
task_obj.task_id = 'task_id'
@@
-561,7
+563,8
@@
key2:
mock_open.assert_has_calls([mock.call('args_file'),
mock.call('task_file')])
mock_open.assert_has_calls([mock.call('args_file'),
mock.call('task_file')])
- def test__render_task_error_arguments(self):
+ @mock.patch.object(builtins, 'print')
+ def test__render_task_error_arguments(self, *args):
with self.assertRaises(exceptions.TaskRenderArgumentError):
task.TaskParser('task_file')._render_task('value1="var3"', None)
with self.assertRaises(exceptions.TaskRenderArgumentError):
task.TaskParser('task_file')._render_task('value1="var3"', None)