cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to 2addc57
Date Wed, 30 Jul 2014 10:28:07 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 a40f2315f -> 2addc57d8


Fixing issues in regression test suite test_accounts.py

(cherry picked from commit 02f769c4d564ef8540e3fd5e704879adc7c9a845)


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

Branch: refs/heads/4.4
Commit: 2addc57d89c8bda84fa82df90ed8c81a490e87e8
Parents: a40f231
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue May 20 20:30:48 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Wed Jul 30 12:27:51 2014 +0200

----------------------------------------------------------------------
 test/integration/component/test_accounts.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2addc57d/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index f8ed69d..a40b88d 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -476,7 +476,8 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
 
         accounts_response = list_accounts(
                                           self.apiclient,
-                                          domainid=self.domain.id
+                                          domainid=self.domain.id,
+                                          listall=True
                                           )
 
         self.assertEqual(
@@ -1686,15 +1687,13 @@ class TestDomainForceRemove(cloudstackTestCase):
                          %s" % (ERROR_CODE_530, str(response)))
 
         self.debug("Checking if the resources in domain are deleted")
-        response = Account.list(
+        with self.assertRaises(Exception):
+            response = Account.list(
                         self.apiclient,
                         name=self.account_1.name,
                         domainid=self.account_1.domainid,
                         listall=True
                         )
-        self.assertEqual(response.errorcode, ERROR_CODE_530, "Job should \
-                         have failed with error code %s, instead got response \
-                         %s" % (ERROR_CODE_530, str(response)))
         return
 
     @attr(tags=["domains", "advanced", "advancedns", "simulator", "selfservice"])


Mime
View raw message