You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2015/02/05 13:02:59 UTC
git commit: updated refs/heads/master to a4e9b4e
Repository: cloudstack
Updated Branches:
refs/heads/master c31e8e740 -> a4e9b4e8a
CLOUDSTACK-8211: Correcting expected secondary storage count value by rounding off to floor value and including the physicalsize of snapshot
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a4e9b4e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a4e9b4e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a4e9b4e8
Branch: refs/heads/master
Commit: a4e9b4e8a4e6bdcec8ad1cda0435f8c61589576f
Parents: c31e8e7
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Wed Feb 4 04:10:26 2015 -0800
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Feb 5 17:32:35 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_ss_limits.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4e9b4e8/test/integration/component/test_ss_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ss_limits.py b/test/integration/component/test_ss_limits.py
index 8662cd5..ec28ea2 100644
--- a/test/integration/component/test_ss_limits.py
+++ b/test/integration/component/test_ss_limits.py
@@ -127,7 +127,7 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
except Exception as e:
return [FAIL, e]
return [PASS, None]
-
+
@data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
@attr(tags = ["advanced"], required_hardware="true")
def test_01_register_template(self, value):
@@ -234,6 +234,8 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
snapshot = response[1]
+ snapshotSize = (snapshot.physicalsize / (1024 ** 3))
+
try:
template = Template.create_from_snapshot(apiclient,
snapshot=snapshot,
@@ -249,7 +251,9 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
"templates list validation failed")
templateSize = (templates[0].size / (1024**3))
- response = matchResourceCount(self.apiclient, templateSize,
+
+ expectedSecondaryStorageCount = int(templateSize + snapshotSize)
+ response = matchResourceCount(self.apiclient, expectedSecondaryStorageCount,
resourceType=RESOURCE_SECONDARY_STORAGE,
accountid=self.account.id)
self.assertEqual(response[0], PASS, response[1])