Merge "Improve response message of flavor deletion"
This commit is contained in:
commit
4c3fd1d9fd
@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from valence.common import exception
|
||||||
from valence.db import api as db_api
|
from valence.db import api as db_api
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
@ -36,7 +37,10 @@ def create_flavor(values):
|
|||||||
|
|
||||||
def delete_flavor(flavorid):
|
def delete_flavor(flavorid):
|
||||||
db_api.Connection.delete_flavor(flavorid)
|
db_api.Connection.delete_flavor(flavorid)
|
||||||
return "Deleted flavor {0}".format(flavorid)
|
return exception.confirmation(
|
||||||
|
confirm_code="DELETED",
|
||||||
|
confirm_detail="This flavor {0} has been deleted successfully"
|
||||||
|
.format(flavorid))
|
||||||
|
|
||||||
|
|
||||||
def update_flavor(flavorid, values):
|
def update_flavor(flavorid, values):
|
||||||
|
@ -14,6 +14,7 @@ from unittest import TestCase
|
|||||||
|
|
||||||
import mock
|
import mock
|
||||||
|
|
||||||
|
from valence.common import exception
|
||||||
from valence.controller import flavors
|
from valence.controller import flavors
|
||||||
from valence.tests.unit.fakes import flavor_fakes as fakes
|
from valence.tests.unit.fakes import flavor_fakes as fakes
|
||||||
|
|
||||||
@ -34,7 +35,10 @@ class TestFlavors(TestCase):
|
|||||||
|
|
||||||
@mock.patch('valence.db.api.Connection.delete_flavor')
|
@mock.patch('valence.db.api.Connection.delete_flavor')
|
||||||
def test_delete_flavor(self, mock_db_delete_flavor):
|
def test_delete_flavor(self, mock_db_delete_flavor):
|
||||||
expected = "Deleted flavor 00000000-0000-0000-0000-000000000000"
|
expected = exception.confirmation(
|
||||||
|
confirm_code="DELETED",
|
||||||
|
confirm_detail="This flavor {0} has been deleted successfully"
|
||||||
|
.format("00000000-0000-0000-0000-000000000000"))
|
||||||
result = flavors.delete_flavor("00000000-0000-0000-0000-000000000000")
|
result = flavors.delete_flavor("00000000-0000-0000-0000-000000000000")
|
||||||
self.assertEqual(expected, result)
|
self.assertEqual(expected, result)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user