Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
standardize ssh auth
[yardstick.git]
/
tests
/
unit
/
benchmark
/
scenarios
/
networking
/
test_netperf_node.py
diff --git
a/tests/unit/benchmark/scenarios/networking/test_netperf_node.py
b/tests/unit/benchmark/scenarios/networking/test_netperf_node.py
index
1c39b29
..
62874cc
100755
(executable)
--- a/
tests/unit/benchmark/scenarios/networking/test_netperf_node.py
+++ b/
tests/unit/benchmark/scenarios/networking/test_netperf_node.py
@@
-12,10
+12,13
@@
# Unittest for
# yardstick.benchmark.scenarios.networking.netperf_node.NetperfNode
# Unittest for
# yardstick.benchmark.scenarios.networking.netperf_node.NetperfNode
-import mock
-import unittest
+from __future__ import absolute_import
+
import os
import os
-import json
+import unittest
+
+import mock
+from oslo_serialization import jsonutils
from yardstick.benchmark.scenarios.networking import netperf_node
from yardstick.benchmark.scenarios.networking import netperf_node
@@
-40,7
+43,7
@@
class NetperfNodeTestCase(unittest.TestCase):
def test_netperf_node_successful_setup(self, mock_ssh):
p = netperf_node.NetperfNode({}, self.ctx)
def test_netperf_node_successful_setup(self, mock_ssh):
p = netperf_node.NetperfNode({}, self.ctx)
- mock_ssh.SSH().execute.return_value = (0, '', '')
+ mock_ssh.SSH
.from_node
().execute.return_value = (0, '', '')
p.setup()
self.assertIsNotNone(p.server)
p.setup()
self.assertIsNotNone(p.server)
@@
-54,12
+57,12
@@
class NetperfNodeTestCase(unittest.TestCase):
result = {}
p = netperf_node.NetperfNode(args, self.ctx)
result = {}
p = netperf_node.NetperfNode(args, self.ctx)
- mock_ssh.SSH().execute.return_value = (0, '', '')
- p.host = mock_ssh.SSH()
+ mock_ssh.SSH
.from_node
().execute.return_value = (0, '', '')
+ p.host = mock_ssh.SSH
.from_node
()
sample_output = self._read_sample_output()
sample_output = self._read_sample_output()
- mock_ssh.SSH().execute.return_value = (0, sample_output, '')
- expected_result = json.loads(sample_output)
+ mock_ssh.SSH
.from_node
().execute.return_value = (0, sample_output, '')
+ expected_result = json
utils
.loads(sample_output)
p.run(result)
self.assertEqual(result, expected_result)
p.run(result)
self.assertEqual(result, expected_result)
@@
-73,12
+76,12
@@
class NetperfNodeTestCase(unittest.TestCase):
result = {}
p = netperf_node.NetperfNode(args, self.ctx)
result = {}
p = netperf_node.NetperfNode(args, self.ctx)
- mock_ssh.SSH().execute.return_value = (0, '', '')
- p.host = mock_ssh.SSH()
+ mock_ssh.SSH
.from_node
().execute.return_value = (0, '', '')
+ p.host = mock_ssh.SSH
.from_node
()
sample_output = self._read_sample_output()
sample_output = self._read_sample_output()
- mock_ssh.SSH().execute.return_value = (0, sample_output, '')
- expected_result = json.loads(sample_output)
+ mock_ssh.SSH
.from_node
().execute.return_value = (0, sample_output, '')
+ expected_result = json
utils
.loads(sample_output)
p.run(result)
self.assertEqual(result, expected_result)
p.run(result)
self.assertEqual(result, expected_result)
@@
-92,11
+95,11
@@
class NetperfNodeTestCase(unittest.TestCase):
result = {}
p = netperf_node.NetperfNode(args, self.ctx)
result = {}
p = netperf_node.NetperfNode(args, self.ctx)
- mock_ssh.SSH().execute.return_value = (0, '', '')
- p.host = mock_ssh.SSH()
+ mock_ssh.SSH
.from_node
().execute.return_value = (0, '', '')
+ p.host = mock_ssh.SSH
.from_node
()
sample_output = self._read_sample_output()
sample_output = self._read_sample_output()
- mock_ssh.SSH().execute.return_value = (0, sample_output, '')
+ mock_ssh.SSH
.from_node
().execute.return_value = (0, sample_output, '')
self.assertRaises(AssertionError, p.run, result)
def test_netperf_node_unsuccessful_script_error(self, mock_ssh):
self.assertRaises(AssertionError, p.run, result)
def test_netperf_node_unsuccessful_script_error(self, mock_ssh):
@@
-106,10
+109,10
@@
class NetperfNodeTestCase(unittest.TestCase):
result = {}
p = netperf_node.NetperfNode(args, self.ctx)
result = {}
p = netperf_node.NetperfNode(args, self.ctx)
- mock_ssh.SSH().execute.return_value = (0, '', '')
- p.host = mock_ssh.SSH()
+ mock_ssh.SSH
.from_node
().execute.return_value = (0, '', '')
+ p.host = mock_ssh.SSH
.from_node
()
- mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
+ mock_ssh.SSH
.from_node
().execute.return_value = (1, '', 'FOOBAR')
self.assertRaises(RuntimeError, p.run, result)
def _read_sample_output(self):
self.assertRaises(RuntimeError, p.run, result)
def _read_sample_output(self):