You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2013/12/04 07:00:35 UTC

git commit: updated refs/heads/master to 6b95595

Updated Branches:
  refs/heads/master e5cfe9481 -> 6b955958c


CLOUDSTACK-5333: Code changes related to snapshots listing

Signed-off-by: Girish Shilamkar <gi...@clogeny.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6b955958
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6b955958
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6b955958

Branch: refs/heads/master
Commit: 6b955958c6165f69de8dbaf6310868d8f5c2a3b1
Parents: e5cfe94
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Wed Dec 4 11:29:50 2013 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Wed Dec 4 11:29:50 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_project_limits.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b955958/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index c497311..7cb29b7 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -24,6 +24,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
+from marvin.codes import PASS
 import datetime
 
 
@@ -781,15 +782,14 @@ class TestResourceLimitsProject(cloudstackTestCase):
                             projectid=self.project.id
                             )
         self.cleanup.append(snapshot_1)
-        # Verify Snapshot state
-        self.assertEqual(
-                            snapshot_1.state in [
-                                                 'BackedUp',
-                                                 'CreatedOnPrimary'
-                                                 ],
-                            True,
-                            "Check Snapshot state is Running or not"
-                        )
+
+        #list snapshots
+        snapshots = list_snapshots(self.apiclient, projectid=self.project.id)
+
+        self.debug("snapshots list: %s" % snapshots)
+
+        self.assertEqual(validateList(snapshots)[0], PASS, "Snapshots list validation failed")
+        self.assertEqual(len(snapshots), 1, "Snapshots list should have exactly one entity")
 
         # Exception should be raised for second snapshot
         with self.assertRaises(Exception):