[Kimchi-devel] [PATCH] [Kimchi 4/6] Fix snapshots test case

[Aline Manera]

Commit a2063007 has added a new test to validate snapshot on running
guest but it has not considered the whole test case in count and it was
failing as below:

======================================================================
FAIL: test_vm_lifecycle (test_model.ModelTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "test_model.py", line 218, in test_vm_lifecycle
    self.assertEquals({}, empty_snap)
AssertionError: {} != {'state': u'running', 'name': u'1486470484', 'parent': u'', 'created': u'1486470 [truncated]...
- {}
+ {'created': u'1486470484',
+  'name': u'1486470484',
+  'parent': u'',
+  'state': u'running'}

So fix it.

Signed-off-by: Aline Manera <alinefm at linux.vnet.ibm.com>
---
 tests/test_model.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/test_model.py b/tests/test_model.py
index a14cf56..95c9e08 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -210,12 +210,14 @@ class ModelTests(unittest.TestCase):
             inst.task_wait(task['id'])
             task = inst.task_lookup(task['id'])
             self.assertEquals('finished', task['status'])
+            snap_name = task['target_uri'].split('/')[-1]
+            created_snaps = [snap_name]
 
             inst.vm_poweroff(u'kimchi-vm')
             vm = inst.vm_lookup(u'kimchi-vm')
 
-            empty_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm')
-            self.assertEquals({}, empty_snap)
+            current_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm')
+            self.assertEquals(created_snaps[0], current_snap['name'])
 
             # this snapshot should be deleted when its VM is deleted
             params = {'name': u'mysnap'}
@@ -223,6 +225,7 @@ class ModelTests(unittest.TestCase):
             inst.task_wait(task['id'])
             task = inst.task_lookup(task['id'])
             self.assertEquals('finished', task['status'])
+            created_snaps.append(params['name'])
 
             self.assertRaises(NotFoundError, inst.vmsnapshot_lookup,
                               u'kimchi-vm', u'foobar')
@@ -231,10 +234,10 @@ class ModelTests(unittest.TestCase):
             self.assertTrue(int(time.time()) >= int(snap['created']))
             self.assertEquals(vm['state'], snap['state'])
             self.assertEquals(params['name'], snap['name'])
-            self.assertEquals(u'', snap['parent'])
+            self.assertEquals(created_snaps[0], snap['parent'])
 
             snaps = inst.vmsnapshots_get_list(u'kimchi-vm')
-            self.assertEquals([params['name']], snaps)
+            self.assertEquals(created_snaps, snaps)
 
             current_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm')
             self.assertEquals(snap, current_snap)
@@ -246,10 +249,10 @@ class ModelTests(unittest.TestCase):
             inst.task_wait(task['id'])
             task = inst.task_lookup(task['id'])
             self.assertEquals('finished', task['status'])
+            created_snaps.append(snap_name)
 
             snaps = inst.vmsnapshots_get_list(u'kimchi-vm')
-            self.assertEquals(sorted([params['name'], snap_name],
-                              key=unicode.lower), snaps)
+            self.assertEquals(sorted(created_snaps, key=unicode.lower), snaps)
 
             snap = inst.vmsnapshot_lookup(u'kimchi-vm', snap_name)
             current_snap = inst.currentvmsnapshot_lookup(u'kimchi-vm')
-- 
2.9.3