You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/06/19 12:41:58 UTC
git commit: updated refs/heads/master to 964deb0
Repository: cloudstack
Updated Branches:
refs/heads/master a764d2c09 -> 964deb024
VM deployments from ISO and attaching ISOs to vm are not supported in LXC. So no point in running iso tests for LXC Bug-Id: CS-42250 Reviewed-By: Shweta
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #487
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/964deb02
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/964deb02
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/964deb02
Branch: refs/heads/master
Commit: 964deb0245ecec322a9fa494c74767656aab11ff
Parents: a764d2c
Author: Sanjeev Neelarapu <sa...@citrix.com>
Authored: Fri Jun 19 15:48:42 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Jun 19 13:41:41 2015 +0300
----------------------------------------------------------------------
test/integration/smoke/test_iso.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/964deb02/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
old mode 100644
new mode 100755
index 79eb814..830f52a
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -41,6 +41,9 @@ class TestCreateIso(cloudstackTestCase):
self.services = self.testClient.getParsedTestDataConfig()
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
+ self.hypervisor = self.testClient.getHypervisorInfo()
+ if self.hypervisor.lower() in ['lxc']:
+ self.skipTest("ISOs are not supported on %s" % self.hypervisor)
# Get Zone, Domain and templates
self.domain = get_domain(self.apiclient)
self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
@@ -150,7 +153,7 @@ class TestISO(cloudstackTestCase):
cls._cleanup = []
cls.unsupportedHypervisor = False
cls.hypervisor = get_hypervisor_type(cls.apiclient)
- if cls.hypervisor.lower() == "simulator":
+ if cls.hypervisor.lower() in ["simulator", "lxc"]:
cls.unsupportedHypervisor = True
return
@@ -230,7 +233,6 @@ class TestISO(cloudstackTestCase):
self.apiclient = self.testClient.getApiClient()
self.dbclient = self.testClient.getDbConnection()
self.cleanup = []
-
if self.unsupportedHypervisor:
self.skipTest("Skipping test because unsupported hypervisor\
%s" % self.hypervisor)