openstack/deb-nova
Code Issues Proposed changes

Merge "Make service create/update fail if version is too old"

Browse Source
This commit is contained in:
Jenkins
2015-10-06 23:27:13 +00:00
committed by Gerrit Code Review
parent 7907e685a8 d3af3f9837
commit e7a27f6f82
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nova/tests/unit/objects/test_service.py
View File

@@ -147,7 +147,8 @@ class _TestServiceObject(object):
@mock.patch.object(db, 'service_create',
return_value=fake_service)
def test_set_id_failure(self, db_mock):
service_obj = service.Service(context=self.context)
service_obj = service.Service(context=self.context,
binary='compute')
service_obj.create()
self.assertRaises(ovo_exc.ReadOnlyFieldError, setattr,
service_obj, 'id', 124)
@@ -297,6 +298,27 @@ class _TestServiceObject(object):
mock_get.assert_called_once_with(self.context, 'compute',
use_slave=False)
@mock.patch('nova.db.service_get_minimum_version', return_value=2)
def test_create_above_minimum(self, mock_get):
with mock.patch('nova.objects.service.SERVICE_VERSION',
new=3):
objects.Service(context=self.context, binary='compute').create()
@mock.patch('nova.db.service_get_minimum_version', return_value=2)
def test_create_equal_to_minimum(self, mock_get):
with mock.patch('nova.objects.service.SERVICE_VERSION',
new=2):
objects.Service(context=self.context, binary='compute').create()
@mock.patch('nova.db.service_get_minimum_version', return_value=2)
def test_create_below_minimum(self, mock_get):
with mock.patch('nova.objects.service.SERVICE_VERSION',
new=1):
self.assertRaises(exception.ServiceTooOld,
objects.Service(context=self.context,
binary='compute',
).create)
class TestServiceObject(test_objects._LocalTest,
_TestServiceObject):