cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From santhosheduku...@apache.org
Subject git commit: updated refs/heads/master to ce622c0
Date Wed, 13 Aug 2014 10:08:54 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 227928946 -> ce622c0a2


Fixed an issue failing in CI, where iscsi support is not available for kvm


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce622c0a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce622c0a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce622c0a

Branch: refs/heads/master
Commit: ce622c0a296c3c715398f31479eacbd7f89b05dd
Parents: 2279289
Author: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Authored: Wed Aug 13 15:38:36 2014 +0530
Committer: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Committed: Wed Aug 13 15:38:36 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_primary_storage.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce622c0a/test/integration/smoke/test_primary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py
index 8926a9e..d2d5b4f 100644
--- a/test/integration/smoke/test_primary_storage.py
+++ b/test/integration/smoke/test_primary_storage.py
@@ -39,6 +39,7 @@ class TestPrimaryStorageServices(cloudstackTestCase):
         # Get Zone and pod
         self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
         self.pod = get_pod(self.apiclient, self.zone.id)
+        self.hypervisor = self.testClient.getHypervisorInfo()
 
         return
 
@@ -56,8 +57,8 @@ class TestPrimaryStorageServices(cloudstackTestCase):
         """Test primary storage pools - XEN, KVM, VMWare
         """
 
-        if self.testClient.getHypervisorInfo().lower() == "hyperv":
-            raise self.skipTest("NFS primary storage not supported on Hyper-V")
+        if self.hypervisor.lower() in ["kvm","hyperv"]:
+            raise self.skipTest("NFS primary storage not supported on kvm or Hyper-V")
 
 
         # Validate the following:


Mime
View raw message