Merge "Top 100 slow tests: api.openstack.compute.test_flavor*"

nova/tests/unit/api/openstack/compute/test_flavor_disabled.py

@@ -76,7 +76,7 @@ class FlavorDisabledTestV21(test.NoDBTestCase):
     def _make_request(self, url):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
-        res = req.get_response(fakes.wsgi_app_v21(init_only=('flavors')))
+        res = req.get_response(fakes.wsgi_app_v21(init_only=('flavors',)))
         return res
 
     def _get_flavor(self, body):
@@ -110,5 +110,5 @@ class FlavorDisabledTestV2(FlavorDisabledTestV21):
     def _make_request(self, url):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
-        res = req.get_response(fakes.wsgi_app())
+        res = req.get_response(fakes.wsgi_app(init_only=('flavors',)))
         return res

nova/tests/unit/api/openstack/compute/test_flavor_manage.py

@@ -104,7 +104,6 @@ class FlavorManageTestV21(test.NoDBTestCase):
                        fake_get_flavor_by_flavor_id)
         self.stubs.Set(flavors, "destroy", fake_destroy)
         self.stub_out("nova.db.flavor_create", fake_create)
-        self.app = self._setup_app()
 
         self.request_body = {
             "flavor": {
@@ -124,7 +123,8 @@ class FlavorManageTestV21(test.NoDBTestCase):
     def _get_http_request(self, url=''):
         return fakes.HTTPRequest.blank(url)
 
-    def _setup_app(self):
+    @property
+    def app(self):
         return fakes.wsgi_app_v21(init_only=('os-flavor-manage',
                                              'os-flavor-rxtx',
                                              'os-flavor-access', 'flavors',
@@ -378,7 +378,6 @@ class PrivateFlavorManageTestV21(test.TestCase):
         super(PrivateFlavorManageTestV21, self).setUp()
         self.flavor_access_controller = (flavor_access_v21.
                                          FlavorAccessController())
-        self.app = self._setup_app()
         self.expected = {
             "flavor": {
                 "name": "test",
@@ -391,7 +390,8 @@ class PrivateFlavorManageTestV21(test.TestCase):
             }
         }
 
-    def _setup_app(self):
+    @property
+    def app(self):
         return fakes.wsgi_app_v21(init_only=('os-flavor-manage',
                                              'os-flavor-access',
                                              'os-flavor-rxtx', 'flavors',
@@ -446,7 +446,8 @@ class FlavorManageTestV2(FlavorManageTestV21):
             osapi_compute_ext_list=['Flavormanage', 'Flavorextradata',
                 'Flavor_access', 'Flavor_rxtx', 'Flavor_swap'])
 
-    def _setup_app(self):
+    @property
+    def app(self):
         return fakes.wsgi_app(init_only=('flavors',),
                               fake_auth_context=self._get_http_request().
                                   environ['nova.context'])
@@ -477,7 +478,8 @@ class PrivateFlavorManageTestV2(PrivateFlavorManageTestV21):
         self.flavor_access_controller = (flavor_access_v2.
                                          FlavorAccessController())
 
-    def _setup_app(self):
+    @property
+    def app(self):
         return fakes.wsgi_app(init_only=('flavors',),
                               fake_auth_context=self._get_http_request().
                                   environ['nova.context'])

nova/tests/unit/api/openstack/compute/test_flavor_rxtx.py

@@ -113,4 +113,4 @@ class FlavorRxtxTestV21(test.NoDBTestCase):
 class FlavorRxtxTestV20(FlavorRxtxTestV21):
 
     def _get_app(self):
-        return fakes.wsgi_app()
+        return fakes.wsgi_app(init_only=('flavors',))

nova/tests/unit/api/openstack/compute/test_flavor_swap.py

@@ -77,7 +77,7 @@ class FlavorSwapTestV21(test.NoDBTestCase):
     def _make_request(self, url):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
-        res = req.get_response(fakes.wsgi_app_v21(init_only=('flavors')))
+        res = req.get_response(fakes.wsgi_app_v21(init_only=('flavors',)))
         return res
 
     def _get_flavor(self, body):
@@ -111,5 +111,5 @@ class FlavorSwapTestV2(FlavorSwapTestV21):
     def _make_request(self, url):
         req = webob.Request.blank(url)
         req.headers['Accept'] = self.content_type
-        res = req.get_response(fakes.wsgi_app())
+        res = req.get_response(fakes.wsgi_app(init_only=('flavors',)))
         return res

nova/tests/unit/api/openstack/compute/test_flavorextradata.py

@@ -64,10 +64,10 @@ class FlavorExtraDataTestV21(test.NoDBTestCase):
                                         fake_get_flavor_by_flavor_id)
         self.stubs.Set(flavors, 'get_all_flavors_sorted_list',
                        fake_get_all_flavors_sorted_list)
-        self._setup_app()
 
-    def _setup_app(self):
-        self.app = fakes.wsgi_app_v21(init_only=('flavors'))
+    @property
+    def app(self):
+        return fakes.wsgi_app_v21(init_only=('flavors'))
 
     def _verify_flavor_response(self, flavor, expected):
         for key in expected:
@@ -123,5 +123,6 @@ class FlavorExtraDataTestV21(test.NoDBTestCase):
 
 class FlavorExtraDataTestV2(FlavorExtraDataTestV21):
 
-    def _setup_app(self):
-        self.app = fakes.wsgi_app(init_only=('flavors',))
+    @property
+    def app(self):
+        return fakes.wsgi_app(init_only=('flavors',))