commit dee3d1797d36cc3e7f55fb69cc4ec9b176fecdb8
author Jenkins <jenkins@review.openstack.org> Wed Mar 13 17:49:22 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Mar 13 17:49:22 2013 +0000
tree f417adb48e7f9de964b9ceb455916c92eb9a99b1
parent da748f181d4ae36a108d2c8b1d6073edb6a24a8b
parent 8d226cc49238101eeca2daab045adf6e422360f4

Merge "xml_to_json should not convert xmlns into attribute"

tempest/tests/compute/admin/test_quotas.py

diff --git a/tempest/tests/compute/admin/test_quotas.py b/tempest/tests/compute/admin/test_quotas.py
index 46a0c20..7f64d15 100644
--- a/tempest/tests/compute/admin/test_quotas.py
+++ b/tempest/tests/compute/admin/test_quotas.py
@@ -135,15 +135,10 @@
 
         self.adm_client.update_quota_set(self.demo_tenant_id,
                                          ram=mem_quota)
-        try:
-            self.create_server()
-        except exceptions.OverLimit:
-            pass
-        else:
-            self.fail("Could create servers over the memory quota limit")
-        finally:
-            self.adm_client.update_quota_set(self.demo_tenant_id,
-                                             ram=default_mem_quota)
+
+        self.addCleanup(self.adm_client.update_quota_set, self.demo_tenant_id,
+                        ram=default_mem_quota)
+        self.assertRaises(exceptions.OverLimit, self.create_server)
 
 #TODO(afazekas): Add test that tried to update the quota_set as a regular user