aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2017-10-26 07:50:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-26 07:50:50 +0000
commit923aa1738cbf5a8053e77e00937fc26f2142f6a3 (patch)
tree274edfbe8cedb6b13d067d2479ed12760e13948f /tests
parent255d5a579ce0ce4acabd971b94f36fe288fe7489 (diff)
parent5a1f65d3e7d67488ee6f558dccfa5ca5581ddb65 (diff)
Merge "KVMFORNFV: To avoid livemigration result update to json"
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/benchmark/scenarios/compute/test_qemumigrate.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/unit/benchmark/scenarios/compute/test_qemumigrate.py b/tests/unit/benchmark/scenarios/compute/test_qemumigrate.py
index 9514729ba..f163f1914 100644
--- a/tests/unit/benchmark/scenarios/compute/test_qemumigrate.py
+++ b/tests/unit/benchmark/scenarios/compute/test_qemumigrate.py
@@ -16,7 +16,6 @@ from __future__ import absolute_import
import unittest
import mock
-from oslo_serialization import jsonutils
from yardstick.benchmark.scenarios.compute import qemu_migrate
@@ -84,7 +83,7 @@ class QemuMigrateTestCase(unittest.TestCase):
mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
q.run(result)
- expected_result = jsonutils.loads(sample_output)
+ expected_result = {}
self.assertEqual(result, expected_result)
def test_qemu_migrate_successful_sla(self, mock_ssh):
@@ -104,7 +103,7 @@ class QemuMigrateTestCase(unittest.TestCase):
mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
q.run(result)
- expected_result = jsonutils.loads(sample_output)
+ expected_result = {}
self.assertEqual(result, expected_result)
def test_qemu_migrate_unsuccessful_sla_totaltime(self, mock_ssh):
@@ -118,7 +117,8 @@ class QemuMigrateTestCase(unittest.TestCase):
sample_output = '{"totaltime": 15, "downtime": 2, "setuptime": 1}'
mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
- self.assertRaises(AssertionError, q.run, result)
+ with self.assertRaises(AssertionError):
+ q.run(result)
def test_qemu_migrate_unsuccessful_sla_downtime(self, mock_ssh):
@@ -131,7 +131,8 @@ class QemuMigrateTestCase(unittest.TestCase):
sample_output = '{"totaltime": 15, "downtime": 2, "setuptime": 1}'
mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
- self.assertRaises(AssertionError, q.run, result)
+ with self.assertRaises(AssertionError):
+ q.run(result)
def test_qemu_migrate_unsuccessful_sla_setuptime(self, mock_ssh):
@@ -142,9 +143,10 @@ class QemuMigrateTestCase(unittest.TestCase):
q.setup()
sample_output = '{"totaltime": 15, "downtime": 2, "setuptime": 1}'
-
+
mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '')
- self.assertRaises(AssertionError, q.run, result)
+ with self.assertRaises(AssertionError):
+ q.run(result)
def test_qemu_migrate_unsuccessful_script_error(self, mock_ssh):
@@ -154,10 +156,9 @@ class QemuMigrateTestCase(unittest.TestCase):
mock_ssh.SSH.from_node().execute.return_value = (0, '', '')
q.setup()
-
mock_ssh.SSH.from_node().execute.return_value = (1, '', 'FOOBAR')
- self.assertRaises(RuntimeError, q.run, result)
-
+ with self.assertRaises(RuntimeError):
+ q.run(result)
def main():
unittest.main()