cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to c0c38f2
Date Thu, 12 Mar 2015 11:12:24 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 2e26e97fe -> c0c38f235


CLOUDSTACK-8236: Automation test cases for storage migration test path review changes

This closes #115

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/master
Commit: c0c38f23500747334b5a4a05b0d3c016a0623e7b
Parents: 2e26e97
Author: pritisarap12 <priti.sarap@clogeny.com>
Authored: Thu Mar 12 15:31:44 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Thu Mar 12 16:42:07 2015 +0530

----------------------------------------------------------------------
 .../testpaths/testpath_storage_migration.py         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0c38f23/test/integration/testpaths/testpath_storage_migration.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_storage_migration.py b/test/integration/testpaths/testpath_storage_migration.py
index 3f1c171..2a92914 100644
--- a/test/integration/testpaths/testpath_storage_migration.py
+++ b/test/integration/testpaths/testpath_storage_migration.py
@@ -542,11 +542,11 @@ class TestStorageMigration(cloudstackTestCase):
         """
 
         # Skipping test case for XenSever because ZWPS scenarios present in the test case
-        # Skipping for Vmware because at a time either ZWPS or CWPS can exists in vmware
+        # Skipping for Vmware because on Vmware zwps and cwps can not exist at the same time
         # so the test case for Vmware is written separately
 
-        if self.hypervisor in ["xenserver", "vmware"]:
-            self.skipTest("Skip test case for %s" % self.hypervisor)
+        if self.hypervisor.lower() in ["xenserver", "vmware"]:
+            self.skipTest("Skip test case for %s" % self.hypervisor.lower())
 
         try:
             self.pools = StoragePool.list(self.apiclient, zoneid=self.zone.id)
@@ -1226,7 +1226,7 @@ class TestStorageMigration(cloudstackTestCase):
         """
 
         # Check if Hypervisor is Xenserver
-        if self.hypervisor != "xenserver":
+        if self.hypervisor.lower() != "xenserver":
             self.skipTest("This test case is written specifically for xenserver,\
                     it does not include ZWPS scenarios")
 
@@ -1671,8 +1671,8 @@ class TestStorageMigration(cloudstackTestCase):
         """
         # Test case only written for Vmware hypervisor as it
         # does not run CWPS and ZWPS scenatios together
-        if self.hypervisor is not "vmware":
-            self.skipTest("Skip test case for %s" % self.hypervisor)
+        if self.hypervisor.lower() is not "vmware":
+            self.skipTest("Skip test case for %s" % self.hypervisor.lower())
 
         try:
             self.pools = StoragePool.list(self.apiclient, zoneid=self.zone.id)
@@ -2102,8 +2102,8 @@ class TestStorageMigration(cloudstackTestCase):
         """
         # Test case only written for Vmware hypervisor as it
         # does not run CWPS and ZWPS scenatios together
-        if self.hypervisor is not "vmware":
-            self.skipTest("Skip test case for %s" % self.hypervisor)
+        if self.hypervisor.lower() is not "vmware":
+            self.skipTest("Skip test case for %s" % self.hypervisor.lower())
 
         try:
             self.pools = StoragePool.list(self.apiclient, zoneid=self.zone.id)


Mime
View raw message