cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject git commit: updated refs/heads/master to c841d68
Date Tue, 23 Jun 2015 12:07:13 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master f29bf1e85 -> c841d6850


CLOUDSTACK-8579: Fix cleanup operation in few test cases

Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #511


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

Branch: refs/heads/master
Commit: c841d6850ec591d3545d922dbb469a7e9b9ec4de
Parents: f29bf1e
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue Jun 23 17:24:05 2015 +0530
Committer: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Committed: Tue Jun 23 17:36:44 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_blocker_bugs.py  | 3 ++-
 test/integration/component/test_project_usage.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c841d685/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index 663c97f..f6a032e 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -743,11 +743,11 @@ class TestTemplates(cloudstackTestCase):
                             cls.services["ostype"]
                             )
         cls.templateSupported = True
+        cls._cleanup = []
         if cls.hypervisor.lower() in ['lxc']:
             cls.templateSupported = False
             return
         cls.services["virtual_machine"]["zoneid"] = cls.zone.id
-        cls._cleanup = []
         try:
             cls.account = Account.create(
                             cls.api_client,
@@ -1024,6 +1024,7 @@ class TestDataPersistency(cloudstackTestCase):
         cls.domain = get_domain(cls.api_client)
         cls.services['mode'] = cls.zone.networktype
         cls.templateSupported = True
+        cls.cleanup = []
         template = get_template(
                             cls.api_client,
                             cls.zone.id,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c841d685/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index 7c4fea6..cdbc4c2 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -512,6 +512,7 @@ class TestVolumeUsage(cloudstackTestCase):
         cls.services['mode'] = cls.zone.networktype
         cls.hypervisor = cls.testClient.getHypervisorInfo()
         cls.rbdStorageFound = True
+        cls._cleanup = []
         if cls.hypervisor.lower() == 'lxc':
             if not find_storage_pool_type(cls.api_client, storagetype='rbd'):
                 cls.rbdStorageFound = False
@@ -1265,6 +1266,7 @@ class TestSnapshotUsage(cloudstackTestCase):
         cls.api_client = cls.testClient.getApiClient()
         cls.hypervisor = cls.testClient.getHypervisorInfo()
         cls.snapshotSupported = True
+        cls._cleanup = []
         if cls.hypervisor.lower() in ['hyperv', 'lxc']:
             cls.snapshotSupported = False
             return


Mime
View raw message