openstack/deb-python-fuelclient
Code Issues Proposed changes

Merge "Fix exception when plugin is being installed with --force"

Browse Source
This commit is contained in:
Jenkins
2015-03-04 19:54:55 +00:00
committed by Gerrit Code Review
parent 54047a3507 218abd03d0
commit 4eb787f1ad
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fuelclient/objects/plugins.py
View File

@@ -420,8 +420,7 @@ class Plugins(base.BaseObject):
if resp_raw.status_code == 409 and force:
# Replace plugin information
url = cls.class_instance_path.format(id=resp['id'])
resp_raw = cls.connection.put_request(url, metadata)
resp = resp_raw.json()
resp = cls.connection.put_request(url, metadata)
else:
resp_raw.raise_for_status()

6
fuelclient/tests/test_plugins_object.py
View File

@@ -347,11 +347,13 @@ class TestPluginsObject(base.UnitTestCase):
return_value=MagicMock(
status_code=409,
**{'json.return_value': {'id': 99}}))
@patch.object(Plugins.connection, 'put_request')
@patch.object(Plugins.connection, 'put_request', return_value='put_return')
def test_update_or_create_updates_with_force(
self, put_mock, post_mock, get_for_update_mock):
meta = {'id': 99, 'version': '1.0.0', 'package_version': '2.0.0'}
self.plugin.update_or_create(meta, force=True)
self.assertEqual(
self.plugin.update_or_create(meta, force=True),
'put_return')
post_mock.assert_called_once_with('plugins/', meta)
get_for_update_mock.assert_called_once_with(meta)
put_mock.assert_called_once_with('plugins/99', meta)