Fixing issues in regression test suite test_accounts.py

Gaurav Aradhye · Girish Shilamkar · commit 326f6d04ea90 · 2014-05-20T20:36:06.000+05:30
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
@@ -476,7 +476,8 @@ def test_01_non_root_admin_Privileges(self):
 
         accounts_response = list_accounts(
                                           self.apiclient,
-                                          domainid=self.domain.id
+                                          domainid=self.domain.id,
+                                          listall=True
                                           )
 
         self.assertEqual(
@@ -1681,15 +1682,13 @@ def test_forceDeleteDomain(self):
                          %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"])
