[Kimchi-devel] [PATCH 2/2] cdrom: update model test for media update

lvroyce at linux.vnet.ibm.com lvroyce at linux.vnet.ibm.com
Fri Feb 21 10:40:15 UTC 2014


From: Royce Lv <lvroyce at linux.vnet.ibm.com>


Signed-off-by: Royce Lv <lvroyce at linux.vnet.ibm.com>
---
 tests/test_model.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/test_model.py b/tests/test_model.py
index 298a39e..0dbc279 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -205,16 +205,22 @@ class ModelTests(unittest.TestCase):
 
             # update path of existing cd with
             # non existent iso
-            self.assertRaises(OperationFailed, inst.vmstorage_update,
+            self.assertRaises(InvalidParameter, inst.vmstorage_update,
                               vm_name, cdrom_dev, {'path': wrong_iso_path})
 
-            # update path of existing cd with
-            # existent iso
+            # update path of existing cd with existent iso of shutoff vm
             inst.vmstorage_update(vm_name, cdrom_dev, {'path': iso_path2})
             cdrom_info = inst.vmstorage_lookup(vm_name, cdrom_dev)
             self.assertEquals(iso_path2, cdrom_info['path'])
 
-            # removing non existent cdrom
+            # update path of existing cd with existent iso of running vm
+            inst.vm_start(vm_name)
+            inst.vmstorage_update(vm_name, cdrom_dev, {'path': iso_path})
+            cdrom_info = inst.vmstorage_lookup(vm_name, cdrom_dev)
+            self.assertEquals(iso_path, cdrom_info['path'])
+            inst.vm_stop(vm_name)
+
+           # removing non existent cdrom
             self.assertRaises(NotFoundError, inst.vmstorage_delete, vm_name,
                               "fakedev")
 
-- 
1.8.1.2




More information about the Kimchi-devel mailing list