[33/51] [abbrv] git commit: updated refs/heads/4.9-bountycastle-daan to d8c42a9

[da...@apache.org]

test: fix cleanup sequence for test_acl_listvolume test

Changes the cleanup sequence as the cleanup code causes exceptions in
several Travis runs such as:
https://travis-ci.org/apache/cloudstack/jobs/129925224

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


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

Branch: refs/heads/4.9-bountycastle-daan
Commit: acc781d0866b3d14fd098f5933621d29351d3f7a
Parents: ae0f169
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Fri May 13 14:16:06 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri May 13 14:16:06 2016 +0530

----------------------------------------------------------------------
 test/integration/component/test_acl_listvolume.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acc781d0/test/integration/component/test_acl_listvolume.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_acl_listvolume.py b/test/integration/component/test_acl_listvolume.py
index 65a1201..12e514d 100644
--- a/test/integration/component/test_acl_listvolume.py
+++ b/test/integration/component/test_acl_listvolume.py
@@ -357,9 +357,9 @@ class TestVolumeList(cloudstackTestCase):
         cls.apiclient = super(TestVolumeList, cls).getClsTestClient().getApiClient()
         cls.apiclient.connection.apiKey = cls.default_apikey
         cls.apiclient.connection.securityKey = cls.default_secretkey
+        cleanup_resources(cls.apiclient, cls.cleanup)
         cls.domain_1.delete(cls.apiclient,cleanup="true")
         cls.domain_2.delete(cls.apiclient,cleanup="true")
-        cleanup_resources(cls.apiclient, cls.cleanup)
         return
 
     def setUp(cls):