You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/24 09:40:25 UTC
git commit: updated refs/heads/master to 7d70e49
Repository: cloudstack
Updated Branches:
refs/heads/master cbf5155f7 -> 7d70e4975
CLOUDSTACK-8576: Skip tests as snapshots and template are not supported on LXC
Signed-off-by: wilderrodrigues <wr...@schubergphilis.com>
This closes #506
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d70e497
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d70e497
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d70e497
Branch: refs/heads/master
Commit: 7d70e4975e53ca124000e52f0cde99292a99ff6d
Parents: cbf5155
Author: pritisarap12 <pr...@clogeny.com>
Authored: Mon Jun 22 16:44:07 2015 +0530
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Wed Jun 24 09:40:08 2015 +0200
----------------------------------------------------------------------
test/integration/component/test_resource_limits.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d70e497/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index 5f29d70..cb06099 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -18,7 +18,7 @@
"""
#Import Local Modules
from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase,unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.base import (VirtualMachine,
Snapshot,
Template,
@@ -448,8 +448,8 @@ class TestResourceLimitsAccount(cloudstackTestCase):
# 5. Create 2 snapshot in account 2. Verify account 2 should be able to
# create snapshots without any warning
- if self.hypervisor.lower() in ['hyperv']:
- self.skipTest("Snapshots feature is not supported on Hyper-V")
+ if self.hypervisor.lower() in ['hyperv', 'lxc']:
+ self.skipTest("Snapshots feature is not supported on Hyper-V and LXC")
self.debug(
"Updating public IP resource limit for account: %s" %
self.account_1.name)
@@ -748,6 +748,8 @@ class TestResourceLimitsAccount(cloudstackTestCase):
# should be denied to create more than 1 template.
# 3. Try to create 2 templates in account 2. Verify account 2 should be
# able to create template without any error
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("Template feature is not supported on LXC")
try:
apiclient_account1 = self.testClient.getUserApiClient(
@@ -1134,8 +1136,8 @@ class TestResourceLimitsDomain(cloudstackTestCase):
# created
# 5. Try to create another snapshot in this domain. It should give the
# user an appropriate error and an alert should be generated.
- if self.hypervisor.lower() in ['hyperv']:
- self.skipTest("Snapshots feature is not supported on Hyper-V")
+ if self.hypervisor.lower() in ['hyperv', 'lxc']:
+ self.skipTest("Snapshots feature is not supported on Hyper-V and LXC")
self.debug(
"Updating snapshot resource limits for domain: %s" %
self.account.domainid)
@@ -1271,6 +1273,9 @@ class TestResourceLimitsDomain(cloudstackTestCase):
# ready state
# 4. Try create 3rd template in the domain. It should give the user an
# appropriate error and an alert should be generated.
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("Template feature is not supported on LXC")
+
try:
userapiclient = self.testClient.getUserApiClient(