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 2014/07/24 16:48:47 UTC
git commit: updated refs/heads/master to 49005b3
Repository: cloudstack
Updated Branches:
refs/heads/master 78a6d557f -> 49005b324
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/49005b32
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/49005b32
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/49005b32
Branch: refs/heads/master
Commit: 49005b324f18e19166bcbb801bcd07609e44d8db
Parents: 78a6d55
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Thu Jul 24 15:21:28 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Thu Jul 24 20:30:48 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/49005b32/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(