masq/halfapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] fix check_domain test c9ecc1f8d2

Browse Source
This commit is contained in:
Maxime Alves LIRMM@home 2023-02-02 22:33:35 +01:00
parent bbb027cd0d
commit c2eb95533c
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
halfapi/cli/domain.py
View File

@ -119,7 +119,7 @@ def list_api_routes():
# list_routes(domain, m_dom) # list_routes(domain, m_dom)
@click.option('--run',default=True, is_flag=True) @click.option('--run',default=False, is_flag=True)
@click.option('--read',default=False, is_flag=True) @click.option('--read',default=False, is_flag=True)
@click.option('--create',default=False, is_flag=True) @click.option('--create',default=False, is_flag=True)
@click.option('--update',default=False, is_flag=True) @click.option('--update',default=False, is_flag=True)
@ -144,11 +144,13 @@ def domain(domain, config_file, delete, update, create, read, run): #, domains,
# TODO: Connect to the create_domain function # TODO: Connect to the create_domain function
raise NotImplementedError raise NotImplementedError
raise Exception('Missing domain name') raise Exception('Missing domain name')
if update: if create:
raise NotImplementedError raise NotImplementedError
if delete: elif update:
raise NotImplementedError raise NotImplementedError
if read: elif delete:
raise NotImplementedError
elif read:
from ..conf import CONFIG from ..conf import CONFIG
from ..halfapi import HalfAPI from ..halfapi import HalfAPI
@ -164,8 +166,17 @@ def domain(domain, config_file, delete, update, create, read, run): #, domains,
default=ORJSONResponse.default_cast) default=ORJSONResponse.default_cast)
) )
if run: else:
from ..conf import CONFIG from ..conf import CONFIG
if 'domain' not in CONFIG:
CONFIG['domain'] = {}
if domain not in CONFIG['domain']:
CONFIG['domain'][domain] = {
'enabled': True,
'name': domain
}
CONFIG['domain'][domain]['enabled'] = True CONFIG['domain'][domain]['enabled'] = True
port = CONFIG['domain'][domain].get('port', 3000) port = CONFIG['domain'][domain].get('port', 3000)

2
halfapi/testing/test_domain.py
View File

@ -98,7 +98,7 @@ class TestDomain(TestCase):
try: try:
result = self.runner.invoke(cli, '--version') result = self.runner.invoke(cli, '--version')
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
result = self.runner.invoke(cli, ['domain', self.DOMAIN, self.config_file]) result = self.runner.invoke(cli, ['domain', '--read', self.DOMAIN, self.config_file])
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
result_d = json.loads(result.stdout) result_d = json.loads(result.stdout)
result = self.runner.invoke(cli, ['run', '--help']) result = self.runner.invoke(cli, ['run', '--help'])