cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to 6202142
Date Thu, 30 Apr 2015 00:55:49 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 0fa145380 -> 620214213


Fixed issues in test path files which are causing failures due to incorrect initialization
of _cleanup list and returning after the skip variable is added.

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


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

Branch: refs/heads/master
Commit: 620214213217814c3e3eba2a262e7dab8f45c851
Parents: 0fa1453
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Thu Apr 30 06:21:08 2015 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Thu Apr 30 06:25:12 2015 +0530

----------------------------------------------------------------------
 test/integration/testpaths/testpath_storage_migration.py | 5 +++--
 test/integration/testpaths/testpath_usage.py             | 9 +++++----
 test/integration/testpaths/testpath_volumelifecycle.py   | 8 ++++++--
 3 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62021421/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 4d6c924..e3cf58c 100644
--- a/test/integration/testpaths/testpath_storage_migration.py
+++ b/test/integration/testpaths/testpath_storage_migration.py
@@ -3587,11 +3587,12 @@ class TestStorageLiveMigrationVmware(cloudstackTestCase):
             cls.testdata["ostype"])
 
         cls._cleanup = []
-        cls.hypervisorNotSupported = False
+        cls.unsupportedHypervisor = False
         cls.NoResource = False
         if cls.hypervisor.lower() not in [
                 "vmware"]:
-            cls.hypervisorNotSupported = True
+            cls.unsupportedHypervisor = True
+            return
         # Get Hosts in the cluster and iscsi/vmfs storages for that cluster
         iscsi_pools = []
         try :

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62021421/test/integration/testpaths/testpath_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_usage.py b/test/integration/testpaths/testpath_usage.py
index 1c3b1b4..f878806 100644
--- a/test/integration/testpaths/testpath_usage.py
+++ b/test/integration/testpaths/testpath_usage.py
@@ -76,7 +76,7 @@ class TestUsage(cloudstackTestCase):
         cls.hypervisor = testClient.getHypervisorInfo()
         cls.apiclient = testClient.getApiClient()
         cls.testdata = testClient.getParsedTestDataConfig()
-
+        cls._cleanup = []
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.apiclient)
         cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
@@ -104,7 +104,7 @@ class TestUsage(cloudstackTestCase):
             cls.apiclient,
             cls.zone.id,
             cls.testdata["ostype"])
-        cls._cleanup = []
+
 
         try:
             # If local storage is enabled, alter the offerings to use
@@ -2959,7 +2959,7 @@ class TestUsageDirectMeteringBasicZone(cloudstackTestCase):
             cls).getClsTestClient()
         cls.apiclient = testClient.getApiClient()
         cls.testdata = testClient.getParsedTestDataConfig()
-
+        cls._cleanup = []
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.apiclient)
         cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
@@ -2970,6 +2970,7 @@ class TestUsageDirectMeteringBasicZone(cloudstackTestCase):
         cls.usageJobNotRunning = False
         if not isUsageJobRunning:
             cls.usageJobNotRunning = True
+            return
 
         if cls.testdata["configurableData"][
                 "setUsageConfigurationThroughTestCase"]:
@@ -2984,7 +2985,7 @@ class TestUsageDirectMeteringBasicZone(cloudstackTestCase):
             cls.apiclient,
             cls.zone.id,
             cls.testdata["ostype"])
-        cls._cleanup = []
+
 
         try:
             # If local storage is enabled, alter the offerings to use

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62021421/test/integration/testpaths/testpath_volumelifecycle.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_volumelifecycle.py b/test/integration/testpaths/testpath_volumelifecycle.py
index 70ca03f..6e979e7 100644
--- a/test/integration/testpaths/testpath_volumelifecycle.py
+++ b/test/integration/testpaths/testpath_volumelifecycle.py
@@ -127,11 +127,15 @@ class TestPathVolume(cloudstackTestCase):
         cls.zone = get_zone(cls.apiclient)
         cls.testdata["mode"] = cls.zone.networktype
         cls.hypervisor = testClient.getHypervisorInfo()
+        cls._cleanup = []
         cls.insuffStorage = False
+        cls.unsupportedHypervisor = False
+
         #for LXC if the storage pool of type 'rbd' ex: ceph is not available, skip the test
         if cls.hypervisor.lower() == 'lxc':
             if not find_storage_pool_type(cls.apiclient, storagetype='rbd'):
-                cls.insuffStorage = True
+                cls.insuffStorage   = True
+                return
 
         cls.template = get_template(
             cls.apiclient,
@@ -143,7 +147,7 @@ class TestPathVolume(cloudstackTestCase):
                 "get_template() failed to return template with description \
                 %s" %
                 cls.testdata["ostype"])
-        cls._cleanup = []
+
         try:
             cls.account = Account.create(cls.apiclient,
                                          cls.testdata["account"],


Mime
View raw message