commit 48b594eaf9d753634e6964ca20ec7c82e14f39d8
author Jenkins <jenkins@review.openstack.org> Fri Feb 26 13:39:38 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Feb 26 13:39:39 2016 +0000
tree 31f9f56402d599954ac5a7e5ae60c390a2089b93
parent 402a6fb50f945767129e501013fea6037a9a6c7f
parent be67e2db50eb8595fcc7894da80fd2e7e6ff2541

Merge "skip overlimit tests when default quota set is -1"

tempest/api/compute/admin/test_servers_negative.py

diff --git a/tempest/api/compute/admin/test_servers_negative.py b/tempest/api/compute/admin/test_servers_negative.py
index 99effd7..07a7a30 100644
--- a/tempest/api/compute/admin/test_servers_negative.py
+++ b/tempest/api/compute/admin/test_servers_negative.py
@@ -68,7 +68,11 @@
         flavor_id = self._get_unused_flavor_id()
         quota_set = (self.quotas_client.show_default_quota_set(self.tenant_id)
                      ['quota_set'])
-        ram = int(quota_set['ram']) + 1
+        ram = int(quota_set['ram'])
+        if ram == -1:
+            raise self.skipException("default ram quota set is -1,"
+                                     " cannot test overlimit")
+        ram += 1
         vcpus = 8
         disk = 10
         flavor_ref = self.flavors_client.create_flavor(name=flavor_name,
@@ -93,7 +97,11 @@
         ram = 512
         quota_set = (self.quotas_client.show_default_quota_set(self.tenant_id)
                      ['quota_set'])
-        vcpus = int(quota_set['cores']) + 1
+        vcpus = int(quota_set['cores'])
+        if vcpus == -1:
+            raise self.skipException("default cores quota set is -1,"
+                                     " cannot test overlimit")
+        vcpus += 1
         disk = 10
         flavor_ref = self.flavors_client.create_flavor(name=flavor_name,
                                                        ram=ram, vcpus=vcpus,