From 8dd32992ee5c85e785e92f4c19455743d5cd4c09 Mon Sep 17 00:00:00 2001
From: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Date: Mon, 28 Apr 2014 02:32:31 -0400
Subject: [PATCH] CLOUDSTACK-5887: Resolved issue in
 test_base_image_updation.py

(cherry picked from commit 1561138157f66485b4e3c762c4166a1c2cacd3d2)
---
 .../component/test_base_image_updation.py         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py
index ac3ac8ea37c..3c059969067 100644
--- a/test/integration/component/test_base_image_updation.py
+++ b/test/integration/component/test_base_image_updation.py
@@ -26,6 +26,7 @@
 
 #Import Local Modules
 from marvin.codes import (PASS,
+                          FAIL,
                           RECURRING)
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
@@ -647,9 +648,13 @@ class TestBaseImageUpdate(cloudstackTestCase):
                    Here we are passing root disk id of vm before reboot which does not exist hence\
                    listing should fail")
 
-        with self.assertRaises(Exception):
-            list_snapshots_policy = SnapshotPolicy.list(
-                                                     self.apiclient,
-                                                     volumeid=vm_with_reset_root_disk_id
-                                                     )
+        try:
+            listSnapshotPolicies = SnapshotPolicy.list(
+                                        self.apiclient,
+                                        volumeid=vm_with_reset_root_disk_id)
+        except Exception as e:
+            self.fail("Failed to list snapshot policies: %s" % e)
+
+        self.assertEqual(validateList(listSnapshotPolicies)[0], FAIL,\
+                "Snapshot policies list should be empty")
         return