Repository: cloudstack Updated Branches: refs/heads/4.4-forward 4e45b2968 -> 4395308bd
CLOUDSTACK-7125: Fixed test_blocker_bugs.py, added code to wait for snapshots to be in 'BackedU' state Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4395308b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4395308b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4395308b Branch: refs/heads/4.4-forward Commit: 4395308bd8b469fb02fc71d1e22f25c7d89b6dff Parents: 4e45b29 Author: Gaurav Aradhye <[email protected]> Authored: Thu Jul 24 15:21:28 2014 +0530 Committer: Girish Shilamkar <[email protected]> Committed: Thu Jul 24 20:31:26 2014 +0530 ---------------------------------------------------------------------- test/integration/component/test_blocker_bugs.py | 45 +++----------------- 1 file changed, 5 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4395308b/test/integration/component/test_blocker_bugs.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py index ba15b18..f0b03c0 100644 --- a/test/integration/component/test_blocker_bugs.py +++ b/test/integration/component/test_blocker_bugs.py @@ -863,26 +863,9 @@ class TestTemplates(cloudstackTestCase): account=self.account.name, domainid=self.account.domainid ) - self.debug("Created snapshot with ID: %s" % snapshot.id) - snapshots = Snapshot.list( - self.apiclient, - id=snapshot.id - ) - self.assertEqual( - isinstance(snapshots, list), - True, - "Check list response returns a valid list" - ) - self.assertNotEqual( - snapshots, - None, - "Check if result exists in list snapshots call" - ) - self.assertEqual( - snapshots[0].id, - snapshot.id, - "Check snapshot id in list resources call" - ) + + response = snapshot.validateState(self.apiclient, Snapshot.BACKED_UP) + self.assertEqual(response[0], PASS, response[1]) # Generate template from the snapshot template = Template.create_from_snapshot( @@ -945,26 +928,8 @@ class TestTemplates(cloudstackTestCase): account=self.account.name, domainid=self.account.domainid ) - self.debug("Created snapshot with ID: %s" % snapshot.id) - snapshots = Snapshot.list( - self.apiclient, - id=snapshot.id - ) - self.assertEqual( - isinstance(snapshots, list), - True, - "Check list response returns a valid list" - ) - self.assertNotEqual( - snapshots, - None, - "Check if result exists in list snapshots call" - ) - self.assertEqual( - snapshots[0].id, - snapshot.id, - "Check snapshot id in list resources call" - ) + response = snapshot.validateState(self.apiclient, Snapshot.BACKED_UP) + self.assertEqual(response[0], PASS, response[1]) # Generate template from the snapshot template = Template.create_from_snapshot(
