openstack
/
horizon
Code Issues Proposed changes

instances.tests: Set return_value for tenant_absolute_limits 

Previously tenant_absolute_limits was mocked but return_value
was not set properly. As a result, MagicMock() is compared to
an integer and this causes TypeError in python 3.

Change-Id: I4c912c77f28df816811b9bb1667629548f3998c4
Closes-Bug: #1815287
This commit is contained in:
Akihiro Motoki 2019-02-09 21:43:32 +09:00
parent 8bc497a5e3
commit 1ca0c6f6ec
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openstack_dashboard/dashboards/project/instances/tests.py
View File

@ -5197,6 +5197,7 @@ class InstanceAjaxTests(helpers.TestCase, InstanceTestHelperMixin):
self.mock_server_get.return_value = server
self.mock_flavor_get.return_value = full_flavors[flavor_id]
self.mock_servers_update_addresses.return_value = None
self.mock_tenant_absolute_limits.return_value = self.limits['absolute']
params = {'action': 'row_update',
'table': 'instances',
@ -5217,6 +5218,8 @@ class InstanceAjaxTests(helpers.TestCase, InstanceTestHelperMixin):
flavor_id)
self.mock_servers_update_addresses.assert_called_once_with(
helpers.IsHttpRequest(), [server])
self.mock_tenant_absolute_limits.assert_called_once_with(
helpers.IsHttpRequest(), reserved=True)
@helpers.create_mocks({api.nova: ("server_get",
"flavor_get",
@ -5248,6 +5251,7 @@ class InstanceAjaxTests(helpers.TestCase, InstanceTestHelperMixin):
self.mock_server_get.return_value = server
self.mock_flavor_get.return_value = full_flavors[flavor_id]
self.mock_servers_update_addresses.return_value = None
self.mock_tenant_absolute_limits.return_value = self.limits['absolute']
params = {'action': 'row_update',
'table': 'instances',
@ -5278,6 +5282,8 @@ class InstanceAjaxTests(helpers.TestCase, InstanceTestHelperMixin):
flavor_id)
self.mock_servers_update_addresses.assert_called_once_with(
helpers.IsHttpRequest(), [server])
self.mock_tenant_absolute_limits.assert_called_once_with(
helpers.IsHttpRequest(), reserved=True)
@helpers.create_mocks({api.nova: ("server_get",
"flavor_get",
@ -5295,6 +5301,7 @@ class InstanceAjaxTests(helpers.TestCase, InstanceTestHelperMixin):
self.mock_server_get.return_value = server
self.mock_flavor_get.side_effect = self.exceptions.nova
self.mock_servers_update_addresses.return_value = None
self.mock_tenant_absolute_limits.return_value = self.limits['absolute']
params = {'action': 'row_update',
'table': 'instances',
@ -5316,6 +5323,8 @@ class InstanceAjaxTests(helpers.TestCase, InstanceTestHelperMixin):
server.flavor['id'])
self.mock_servers_update_addresses.assert_called_once_with(
helpers.IsHttpRequest(), [server])
self.mock_tenant_absolute_limits.assert_called_once_with(
helpers.IsHttpRequest(), reserved=True)
class ConsoleManagerTests(helpers.ResetImageAPIVersionMixin, helpers.TestCase):