commit 67380a41eef512c254297ccbf7918de7d555362a
author Jenkins <jenkins@review.openstack.org> Fri Mar 21 05:02:39 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 21 05:02:39 2014 +0000
tree 559de733788d5e9bb0651ed884216601d34f5874
parent eb745dad7b9cfcb7ca09797efa4c60c3a831d7d1
parent 2cb18265709a79a5352bfbb299f5ccbc994cd438

Merge "Fix cinder quota cleanup"

tempest/api/volume/admin/test_volume_quotas.py

diff --git a/tempest/api/volume/admin/test_volume_quotas.py b/tempest/api/volume/admin/test_volume_quotas.py
index cf308f5..2949d56 100644
--- a/tempest/api/volume/admin/test_volume_quotas.py
+++ b/tempest/api/volume/admin/test_volume_quotas.py
@@ -61,9 +61,11 @@
             self.demo_tenant_id,
             **new_quota_set)
 
-        default_quota_set.pop('id')
+        cleanup_quota_set = dict(
+            (k, v) for k, v in default_quota_set.iteritems()
+            if k in QUOTA_KEYS)
         self.addCleanup(self.quotas_client.update_quota_set,
-                        self.demo_tenant_id, **default_quota_set)
+                        self.demo_tenant_id, **cleanup_quota_set)
         self.assertEqual(200, resp.status)
         # test that the specific values we set are actually in
         # the final result. There is nothing here that ensures there