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 2014/12/09 14:31:57 UTC

[1/3] git commit: updated refs/heads/master to c4d3837

Repository: cloudstack
Updated Branches:
  refs/heads/master aa84b0549 -> c4d383786


CLOUDSTACK-8048: Fix test_ss_limits.py

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/09771400
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09771400
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09771400

Branch: refs/heads/master
Commit: 0977140043e2d7465919ad7a10c57ab63ca05b76
Parents: aa84b05
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Dec 9 10:56:03 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Tue Dec 9 19:01:27 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_ss_limits.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09771400/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 4d6efc4..c83a7f5 100644
--- a/test/integration/component/test_ss_limits.py
+++ b/test/integration/component/test_ss_limits.py
@@ -233,7 +233,14 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
         except Exception as e:
             self.fail("Failed to create template: %s" % e)
 
-        templateSize = (template.size / (1024**3))
+        templates = Template.list(apiclient,
+                                  templatefilter=\
+                                  self.services["template_2"]["templatefilter"],
+                                  id=template.id)
+        self.assertEqual(validateList(templates)[0],PASS,\
+                        "templates list validation failed")
+
+        templateSize = (templates[0].size / (1024**3))
         response = matchResourceCount(self.apiclient, templateSize,
                                       resourceType=RESOURCE_SECONDARY_STORAGE,
                                       accountid=self.account.id)


[3/3] git commit: updated refs/heads/master to c4d3837

Posted by ta...@apache.org.
CLOUDSTACK-8053: Fix loop termination - test_vpc_host_maintenance.py

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/c4d38378
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c4d38378
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c4d38378

Branch: refs/heads/master
Commit: c4d383786fb80f51861488b206ce35dd509ace65
Parents: f07c6bc
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Dec 9 16:45:04 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Tue Dec 9 19:01:44 2014 +0530

----------------------------------------------------------------------
 test/integration/component/maint/test_vpc_host_maintenance.py | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c4d38378/test/integration/component/maint/test_vpc_host_maintenance.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_vpc_host_maintenance.py b/test/integration/component/maint/test_vpc_host_maintenance.py
index 7027469..74d59e7 100644
--- a/test/integration/component/maint/test_vpc_host_maintenance.py
+++ b/test/integration/component/maint/test_vpc_host_maintenance.py
@@ -221,6 +221,7 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
             cls.hosts = Host.list(cls.api_client, clusterid=cluster.id)
             if len(cls.hosts) >= 2:
                 clusterWithSufficientHosts = cluster
+                break
 
         if clusterWithSufficientHosts is None:
             raise unittest.SkipTest("No Cluster with 2 hosts found")


[2/3] git commit: updated refs/heads/master to c4d3837

Posted by ta...@apache.org.
CLOUDSTACK-8049: Tagging test cases which cannot be run on simulator accordingly

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/f07c6bce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f07c6bce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f07c6bce

Branch: refs/heads/master
Commit: f07c6bce49022ab83d6659a6dfcf42134488e93b
Parents: 0977140
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue Dec 9 12:29:17 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Tue Dec 9 19:01:34 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_ps_resize_volume.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f07c6bce/test/integration/component/test_ps_resize_volume.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ps_resize_volume.py b/test/integration/component/test_ps_resize_volume.py
index 5df4a62..bff1672 100644
--- a/test/integration/component/test_ps_resize_volume.py
+++ b/test/integration/component/test_ps_resize_volume.py
@@ -159,7 +159,7 @@ class TestResizeVolume(cloudstackTestCase):
             return [FAIL, e]
         return [PASS, None]
 
-    @attr(tags=["advanced"], required_hardware="false")
+    @attr(tags=["advanced"], required_hardware="true")
     def test_01_increase_volume_size_within_account_limit(self):
 	"""Test increasing volume size within the account limit and verify primary storage usage
 
@@ -223,7 +223,7 @@ class TestResizeVolume(cloudstackTestCase):
             self.fail("Failed with exception: %s" % e)
         return
 
-    @attr(tags=["advanced"], required_hardware="false")
+    @attr(tags=["advanced"], required_hardware="true")
     def test_02_increase_volume_size_above_account_limit(self):
 	"""Test increasing volume size above the account limit
 
@@ -281,7 +281,7 @@ class TestResizeVolume(cloudstackTestCase):
             volume.resize(apiclient, diskofferingid=self.disk_offering_20_GB.id)
         return
 
-    @attr(tags=["advanced"], required_hardware="false")
+    @attr(tags=["advanced"], required_hardware="true")
     def test_03_increase_volume_size_above_domain_limit(self):
 	"""Test increasing volume size above the domain limit