Remove flexmock from volume type controller test
Change-Id: I96ed858aa2a32ec031f604862d2e38165bab5cf0
This commit is contained in:
parent
1d007ad09f
commit
8a8e7fa781
|
@ -542,13 +542,13 @@ def list_volume_types():
|
|||
return volume_type_ctl.list_volume_types()
|
||||
|
||||
|
||||
@api.route("/volume_type/<type_id>", methods=["GET"])
|
||||
@api.route("/volume_type/<volume_type_id>", methods=["GET"])
|
||||
@authenticated
|
||||
@to_json
|
||||
def get_volume_type(type_id):
|
||||
def get_volume_type(volume_type_id):
|
||||
"""Get a volume type.
|
||||
|
||||
:arg uuid type_id: Volume Type Uuid
|
||||
:arg uuid volume_type_id: Volume Type Uuid
|
||||
|
||||
:code 200 OK: Volume type exists
|
||||
:code 400 Bad Request: If request data has an invalid or missing field
|
||||
|
@ -559,8 +559,8 @@ def get_volume_type(type_id):
|
|||
.. literalinclude:: ../api_examples/output/volume_type.json
|
||||
:language: json
|
||||
"""
|
||||
LOG.info("Get volumes type for id %s", type_id)
|
||||
return volume_type_ctl.get_volume_type(type_id)
|
||||
LOG.info("Get volumes type for id %s", volume_type_id)
|
||||
return volume_type_ctl.get_volume_type(volume_type_id)
|
||||
|
||||
|
||||
@api.route("/volume_type", methods=["POST"])
|
||||
|
@ -589,10 +589,10 @@ def create_volume_type():
|
|||
return flask.Response(status=201)
|
||||
|
||||
|
||||
@api.route("/volume_type/<type_id>", methods=["DELETE"])
|
||||
@api.route("/volume_type/<volume_type_id>", methods=["DELETE"])
|
||||
@authenticated
|
||||
@to_json
|
||||
def delete_volume_type(type_id):
|
||||
def delete_volume_type(volume_type_id):
|
||||
"""Delete the volume type.
|
||||
|
||||
:arg uuid type_id: Volume Type Uuid
|
||||
|
@ -600,8 +600,8 @@ def delete_volume_type(type_id):
|
|||
:code 202 Accepted: Volume successfully deleted
|
||||
:code 404 Not Found: If volume type does not exist.
|
||||
"""
|
||||
LOG.info("Deleting volume type with id '%s'", type_id)
|
||||
volume_type_ctl.delete_volume_type(type_id)
|
||||
LOG.info("Deleting volume type with id '%s'", volume_type_id)
|
||||
volume_type_ctl.delete_volume_type(volume_type_id)
|
||||
return flask.Response(status=202)
|
||||
|
||||
|
||||
|
|
|
@ -30,11 +30,11 @@ class VolumeTypeController(base_controller.BaseController):
|
|||
volume_type = model.VolumeType(volume_type_id, volume_type_name)
|
||||
self.database_adapter.insert_volume_type(volume_type)
|
||||
|
||||
def get_volume_type(self, type_id):
|
||||
return self.database_adapter.get_volume_type(type_id)
|
||||
def get_volume_type(self, volume_type_id):
|
||||
return self.database_adapter.get_volume_type(volume_type_id)
|
||||
|
||||
def delete_volume_type(self, type_id):
|
||||
self.database_adapter.delete_volume_type(type_id)
|
||||
def delete_volume_type(self, volume_type_id):
|
||||
self.database_adapter.delete_volume_type(volume_type_id)
|
||||
|
||||
def list_volume_types(self):
|
||||
return self.database_adapter.list_volume_types()
|
||||
|
|
|
@ -13,8 +13,7 @@
|
|||
# limitations under the License.
|
||||
|
||||
from almanach.core.controllers import volume_type_controller
|
||||
from almanach.storage.drivers import base_driver
|
||||
from flexmock import flexmock
|
||||
import mock
|
||||
|
||||
from almanach.tests.unit import base
|
||||
from almanach.tests.unit.builders.entity import a
|
||||
|
@ -25,43 +24,30 @@ class VolumeTypeControllerTest(base.BaseTestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(VolumeTypeControllerTest, self).setUp()
|
||||
self.database_adapter = flexmock(base_driver.BaseDriver)
|
||||
self.database_adapter = mock.Mock()
|
||||
self.controller = volume_type_controller.VolumeTypeController(self.database_adapter)
|
||||
|
||||
def test_volume_type_created(self):
|
||||
def test_create_volume_type(self):
|
||||
fake_volume_type = a(volume_type())
|
||||
|
||||
(flexmock(self.database_adapter)
|
||||
.should_receive("insert_volume_type")
|
||||
.with_args(fake_volume_type)
|
||||
.once())
|
||||
|
||||
self.controller.create_volume_type(fake_volume_type.volume_type_id, fake_volume_type.volume_type_name)
|
||||
self.database_adapter.insert_volume_type.assert_called_once_with(fake_volume_type)
|
||||
|
||||
def test_get_volume_type(self):
|
||||
some_volume = a(volume_type())
|
||||
(flexmock(self.database_adapter)
|
||||
.should_receive("get_volume_type")
|
||||
.and_return(some_volume)
|
||||
.once())
|
||||
self.database_adapter.get_volume_type.return_value = some_volume
|
||||
|
||||
returned_volume_type = self.controller.get_volume_type(some_volume.volume_type_id)
|
||||
a_volume_type = self.controller.get_volume_type(some_volume.volume_type_id)
|
||||
|
||||
self.assertEqual(some_volume, returned_volume_type)
|
||||
self.assertEqual(some_volume, a_volume_type)
|
||||
self.database_adapter.get_volume_type.assert_called_once_with(some_volume.volume_type_id)
|
||||
|
||||
def test_delete_volume_type(self):
|
||||
some_volume = a(volume_type())
|
||||
(flexmock(self.database_adapter)
|
||||
.should_receive("delete_volume_type")
|
||||
.once())
|
||||
|
||||
self.controller.delete_volume_type(some_volume.volume_type_id)
|
||||
self.database_adapter.delete_volume_type.assert_called_once_with(some_volume.volume_type_id)
|
||||
|
||||
def test_list_volume_types(self):
|
||||
some_volumes = [a(volume_type()), a(volume_type())]
|
||||
(flexmock(self.database_adapter)
|
||||
.should_receive("list_volume_types")
|
||||
.and_return(some_volumes)
|
||||
.once())
|
||||
|
||||
self.database_adapter.list_volume_types.return_value = some_volumes
|
||||
self.assertEqual(len(self.controller.list_volume_types()), 2)
|
||||
self.database_adapter.list_volume_types.assert_called_once()
|
||||
|
|
Loading…
Reference in New Issue