Merge remote-tracking branch 'upstream/rbac' into merge_api_with_orm

This commit is contained in:
0mar
2020-12-17 09:22:44 +01:00
3 changed files with 17 additions and 2 deletions

View File

@@ -1585,7 +1585,7 @@ async def test_get_services(app, mockservice_url):
mockservice.name: {
'name': mockservice.name,
'admin': True,
'roles': [],
'roles': ['admin'],
'command': mockservice.command,
'pid': mockservice.proc.pid,
'prefix': mockservice.server.base_url,
@@ -1610,7 +1610,7 @@ async def test_get_service(app, mockservice_url):
assert service == {
'name': mockservice.name,
'admin': True,
'roles': [],
'roles': ['admin'],
'command': mockservice.command,
'pid': mockservice.proc.pid,
'prefix': mockservice.server.base_url,