From c7b4ca3600addd5aa51435c21c0cbc6de7957b5b Mon Sep 17 00:00:00 2001
From: Rajat Vig <rajatv@thoughtworks.com>
Date: Wed, 28 Oct 2015 13:47:49 -0700
Subject: [PATCH] Mock flavor_list method in tests for instances

nova.flavor_list is not mocked in the tests and
that is causing test failures in jenkins.

Closes Bug: #1511109

Change-Id: I6b9a457e103571d16dc54f94dae86c8d89feb4cb
---
 .../dashboards/project/instances/tests.py            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/openstack_dashboard/dashboards/project/instances/tests.py b/openstack_dashboard/dashboards/project/instances/tests.py
index b0ad16b7a7..f297940e5c 100644
--- a/openstack_dashboard/dashboards/project/instances/tests.py
+++ b/openstack_dashboard/dashboards/project/instances/tests.py
@@ -742,6 +742,7 @@ class InstanceTests(helpers.TestCase):
 
     @helpers.create_stubs({api.nova: ('server_lock',
                                       'server_list',
+                                      'flavor_list',
                                       'extension_supported',),
                            api.glance: ('image_list_detailed',),
                            api.network: ('servers_update_addresses',)})
@@ -753,6 +754,8 @@ class InstanceTests(helpers.TestCase):
             http.HttpRequest)).MultipleTimes().AndReturn(True)
         api.glance.image_list_detailed(IgnoreArg()).AndReturn((
             self.images.list(), False, False))
+        api.nova.flavor_list(IsA(http.HttpRequest)) \
+            .AndReturn(self.flavors.list())
         search_opts = {'marker': None, 'paginate': True}
         api.nova.server_list(
             IsA(http.HttpRequest),
@@ -769,6 +772,7 @@ class InstanceTests(helpers.TestCase):
 
     @helpers.create_stubs({api.nova: ('server_lock',
                                       'server_list',
+                                      'flavor_list',
                                       'extension_supported',),
                            api.glance: ('image_list_detailed',),
                            api.network: ('servers_update_addresses',)})
@@ -780,6 +784,8 @@ class InstanceTests(helpers.TestCase):
             http.HttpRequest)).MultipleTimes().AndReturn(True)
         api.glance.image_list_detailed(IgnoreArg()).AndReturn((
             self.images.list(), False, False))
+        api.nova.flavor_list(IsA(http.HttpRequest)) \
+            .AndReturn(self.flavors.list())
         search_opts = {'marker': None, 'paginate': True}
         api.nova.server_list(
             IsA(http.HttpRequest),
@@ -797,6 +803,7 @@ class InstanceTests(helpers.TestCase):
 
     @helpers.create_stubs({api.nova: ('server_unlock',
                                       'server_list',
+                                      'flavor_list',
                                       'extension_supported',),
                            api.glance: ('image_list_detailed',),
                            api.network: ('servers_update_addresses',)})
@@ -805,6 +812,8 @@ class InstanceTests(helpers.TestCase):
         server = servers[0]
         api.nova.extension_supported('AdminActions', IsA(
             http.HttpRequest)).MultipleTimes().AndReturn(True)
+        api.nova.flavor_list(IsA(http.HttpRequest)) \
+            .AndReturn(self.flavors.list())
         api.glance.image_list_detailed(IgnoreArg()).AndReturn((
             self.images.list(), False, False))
         search_opts = {'marker': None, 'paginate': True}
@@ -823,6 +832,7 @@ class InstanceTests(helpers.TestCase):
 
     @helpers.create_stubs({api.nova: ('server_unlock',
                                       'server_list',
+                                      'flavor_list',
                                       'extension_supported',),
                            api.glance: ('image_list_detailed',),
                            api.network: ('servers_update_addresses',)})
@@ -835,6 +845,8 @@ class InstanceTests(helpers.TestCase):
         api.glance.image_list_detailed(IgnoreArg()).AndReturn((
             self.images.list(), False, False))
         search_opts = {'marker': None, 'paginate': True}
+        api.nova.flavor_list(IsA(http.HttpRequest)) \
+            .AndReturn(self.flavors.list())
         api.nova.server_list(
             IsA(http.HttpRequest),
             search_opts=search_opts).AndReturn([servers, False])