Merge "KVMFORNFV: To avoid livemigration result update to json"

2 files changed, 13 insertions, 12 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()
diff --git a/yardstick/benchmark/scenarios/compute/qemu_migrate.py b/yardstick/benchmark/scenarios/compute/qemu_migrate.py
index 2de1270ef..286d8cdaf 100644
--- a/yardstick/benchmark/scenarios/compute/qemu_migrate.py
+++ b/yardstick/benchmark/scenarios/compute/qemu_migrate.py
@@ -113,11 +113,11 @@ class QemuMigrate(base.Scenario):
         if status:
             raise RuntimeError(stderr)
 
-        result.update(jsonutils.loads(stdout))
+        parsed_data = jsonutils.loads(stdout)
 
         if "sla" in self.scenario_cfg:
             sla_error = ""
-            for t, timevalue in result.items():
+            for t, timevalue in parsed_data.items():
                 if 'max_%s' % t not in self.scenario_cfg['sla']:
                     continue