commit 5921b52396926a4c41165a2aeaf4f9f4e69ea172
author Jenkins <jenkins@review.openstack.org> Thu Feb 19 11:12:51 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Feb 19 11:12:51 2015 +0000
tree 33a215ac8cd3d76aa3d74390b007de73aa0275d4
parent 88dcb3cf88f07347a0e98f16d2313ea091da52c4
parent b30bb11f68bfccaa9df7b2046366c3ad1e1f3404

Merge "Split resource_setup for limit tests"

tempest/api/compute/limits/test_absolute_limits.py

diff --git a/tempest/api/compute/limits/test_absolute_limits.py b/tempest/api/compute/limits/test_absolute_limits.py
index 520dfa9..de6eecb 100644
--- a/tempest/api/compute/limits/test_absolute_limits.py
+++ b/tempest/api/compute/limits/test_absolute_limits.py
@@ -20,8 +20,8 @@
 class AbsoluteLimitsTestJSON(base.BaseV2ComputeTest):
 
     @classmethod
-    def resource_setup(cls):
-        super(AbsoluteLimitsTestJSON, cls).resource_setup()
+    def setup_clients(cls):
+        super(AbsoluteLimitsTestJSON, cls).setup_clients()
         cls.client = cls.limits_client
 
     @test.attr(type='gate')

tempest/api/compute/limits/test_absolute_limits_negative.py

diff --git a/tempest/api/compute/limits/test_absolute_limits_negative.py b/tempest/api/compute/limits/test_absolute_limits_negative.py
index 9776db3..d82a2e5 100644
--- a/tempest/api/compute/limits/test_absolute_limits_negative.py
+++ b/tempest/api/compute/limits/test_absolute_limits_negative.py
@@ -28,8 +28,8 @@
         super(AbsoluteLimitsNegativeTestJSON, self).setUp()
 
     @classmethod
-    def resource_setup(cls):
-        super(AbsoluteLimitsNegativeTestJSON, cls).resource_setup()
+    def setup_clients(cls):
+        super(AbsoluteLimitsNegativeTestJSON, cls).setup_clients()
         cls.client = cls.limits_client
         cls.server_client = cls.servers_client