reworks on tests

This commit is contained in:
2019-12-16 17:14:50 +01:00
parent f0042f2a37
commit 10969ab1e0
9 changed files with 84 additions and 71 deletions

View File

@ -250,7 +250,7 @@ class Dispatcher(register.RegisterDispatcher, CallDispatcher, PublishDispatcher)
except AttributeError:
if DEBUG:
print_exc()
raise AttributeError(_(f'unknown parameter "{key}"'))
raise ValueError(_(f'unknown parameter "{key}"'))
# check mandatories options
config.property.read_only()
mandatories = list(config.value.mandatory())

View File

@ -280,7 +280,7 @@ class Risotto(Controller):
self.load_server(risotto_context,
server_id,
servername,
servermodel_id)
servermodelid)
@register('v1.server.deleted')
async def server_deleted(self,

View File

@ -137,7 +137,7 @@ class Risotto(Controller):
return [dict(r) for r in servermodels]
@register('v1.servermodel.describe', None)
async def servermodel_describe(self, inheritance, creolefuncs, servermodelid, schema, conffiles, resolvdepends, probes):
async def servermodel_describe(self, inheritance, creolefuncs, servermodel_id, schema, conffiles, resolvdepends, probes):
schema = """<?xml version='1.0' encoding='UTF-8'?>
<creole>
<family name="containers">
@ -188,4 +188,4 @@ class Risotto(Controller):
<separators/>
</family>
</creole>"""
return {'servermodelid': 1, 'servermodelname': 'name', 'servermodeldescription': 'description', 'subreleasename': 'name', 'source_id': 1, 'schema': schema, 'creolefuncs': ''}
return {'servermodel_id': 1, 'servermodel_name': 'name', 'servermodel_description': 'description', 'release_id': 1, 'schema': schema, 'creolefuncs': ''}