From 648841d90fd9f99fec008670e25b761748e1fb77 Mon Sep 17 00:00:00 2001 From: Maxime Alves LIRMM Date: Wed, 8 Dec 2021 13:08:22 +0100 Subject: [PATCH] [dummy_domain] set an id to dummy_domain --- halfapi/halfapi.py | 4 ++-- halfapi/lib/constants.py | 1 + tests/conftest.py | 4 ++-- tests/dummy_domain/__init__.py | 1 + tests/test_debug_routes.py | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/halfapi/halfapi.py b/halfapi/halfapi.py index b7d2fe4..b116914 100644 --- a/halfapi/halfapi.py +++ b/halfapi/halfapi.py @@ -122,10 +122,10 @@ class HalfAPI: logger.debug('Mounting domain %s on %s', domain.get('name'), path) self.__application.mount(path, HalfDomain( - self.application, domain.get('name', key), domain.get('router'), - config=domain.get('config', {}) + domain.get('config', {}), + self.application ) ) diff --git a/halfapi/lib/constants.py b/halfapi/lib/constants.py index 2a0f54c..b0dd1f6 100644 --- a/halfapi/lib/constants.py +++ b/halfapi/lib/constants.py @@ -39,6 +39,7 @@ ROUTE_SCHEMA = Schema({ DOMAIN_SCHEMA = Schema({ 'name': str, + 'id': str, Optional('routers'): str, Optional('version'): str, Optional('patch_release'): str, diff --git a/tests/conftest.py b/tests/conftest.py index b19e44d..313a089 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -279,8 +279,8 @@ def application_debug(project_runner): 'production':False, 'domain': { 'dummy_domain': { - 'name': 'test_domain', - 'router': 'test_domain.routers', + 'name': 'dummy_domain', + 'router': '.routers', 'enabled': True, 'prefix': False, 'config':{ diff --git a/tests/dummy_domain/__init__.py b/tests/dummy_domain/__init__.py index 57d71ac..fed7f0f 100644 --- a/tests/dummy_domain/__init__.py +++ b/tests/dummy_domain/__init__.py @@ -2,4 +2,5 @@ __name__ = 'dummy_domain' __version__ = '0.0.0' __patch_release__ = '0.0.0' __routers__ = '.routers' +__id__ = '8b88e60a625369235b36c2d6d70756a0c02c1c7fb169fcee6dc820bcf9723f5a' diff --git a/tests/test_debug_routes.py b/tests/test_debug_routes.py index 95c0b8e..41d30dc 100644 --- a/tests/test_debug_routes.py +++ b/tests/test_debug_routes.py @@ -6,6 +6,7 @@ import subprocess import json import os import sys +import pprint from halfapi.lib.constants import API_SCHEMA @@ -25,10 +26,9 @@ def test_routes(application_debug): r = c.get('/halfapi/error/500') assert r.status_code == 500 r = c.get('/') - print(r.content) d_r = r.json() assert isinstance(d_r, dict) - # assert API_SCHEMA.validate(d_r) + assert API_SCHEMA.validate(d_r) """ TODO: Find a way to test exception raising