From 2fcdf3acf203ed8258f77b9a3c33a0dc6ad83698 Mon Sep 17 00:00:00 2001 From: Sanjeev Neelarapu Date: Fri, 19 Jun 2015 15:48:42 +0530 Subject: [PATCH] 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 --- test/integration/smoke/test_iso.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 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 79eb8141ac03..830f52adf899 --- a/test/integration/smoke/test_iso.py +++ b/test/integration/smoke/test_iso.py @@ -41,6 +41,9 @@ def setUp(self): 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 @@ def setUpClass(cls): 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 @@ def setUp(self): 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)