Updated Branches: refs/heads/4.2 27c2c125d -> 11231d6b1
CLOUDSTACK-5333: Code changes related to snapshots listing Signed-off-by: Girish Shilamkar <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11231d6b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11231d6b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11231d6b Branch: refs/heads/4.2 Commit: 11231d6b12770c98d32e533d94ec63183cc19eda Parents: 27c2c12 Author: Gaurav Aradhye <[email protected]> Authored: Wed Dec 4 11:29:50 2013 +0530 Committer: Girish Shilamkar <[email protected]> Committed: Wed Dec 4 11:31:33 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/11231d6b/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):
