From 42e08d807f1fccb100702c7c5838822947c88a9e Mon Sep 17 00:00:00 2001 From: Alexander Watzinger Date: Fri, 3 Nov 2023 15:48:39 +0100 Subject: [PATCH] Tests with Bernhard --- openatlas/api/endpoints/display_image.py | 6 +++--- openatlas/api/formats/loud.py | 2 +- openatlas/display/util.py | 2 +- tests/base.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openatlas/api/endpoints/display_image.py b/openatlas/api/endpoints/display_image.py index 908bb32e2..e07cb53e3 100644 --- a/openatlas/api/endpoints/display_image.py +++ b/openatlas/api/endpoints/display_image.py @@ -45,13 +45,13 @@ def get() -> tuple[Any, int]: if license_ := get_license_name(entity): if path := get_file_path(entity): iiif_manifest = '' - if check_iiif_activation() \ - and check_iiif_file_exist(entity.id): + if (check_iiif_activation() and + check_iiif_file_exist(entity.id)): iiif_manifest = url_for( 'api.iiif_manifest', version=g.settings['iiif']['version'], id_=entity.id, - _external=True) + _external=True) # pragma: no cover files_dict[path.stem] = { 'extension': path.suffix, 'display': url_for( diff --git a/openatlas/api/formats/loud.py b/openatlas/api/formats/loud.py index f31c3a9bc..7dd35782d 100644 --- a/openatlas/api/formats/loud.py +++ b/openatlas/api/formats/loud.py @@ -85,7 +85,7 @@ def get_domain_links() -> dict[str, Any]: id_ = link_.domain.id suffix = g.files[id_].suffix.replace('.', '') if not app.config['IMAGE_FORMATS'].get(suffix): - continue + continue # pragma: no cover image = { "id": url_for('api.entity', id_=id_, _external=True), "_label": link_.domain.name, diff --git a/openatlas/display/util.py b/openatlas/display/util.py index 3973d600d..66899e123 100644 --- a/openatlas/display/util.py +++ b/openatlas/display/util.py @@ -775,7 +775,7 @@ def check_iiif_activation() -> bool: def check_iiif_file_exist(id_: int) -> bool: if g.settings['iiif_conversion']: return get_iiif_file_path(id_).is_file() - return bool(get_file_path(id_)) + return bool(get_file_path(id_)) # pragma: no cover def get_iiif_file_path(id_: int) -> Path: diff --git a/tests/base.py b/tests/base.py index 429b30131..1407fd73e 100644 --- a/tests/base.py +++ b/tests/base.py @@ -52,7 +52,7 @@ def setup_database(self) -> None: Path(app.root_path).parent / 'install' / f'{file_name}.sql', encoding='utf8') as sql_file: self.cursor.execute(sql_file.read()) - if app.config['LOAD_WINDOWS_TEST_SQL']: + if app.config['LOAD_WINDOWS_TEST_SQL']: # pragma: no cover with open( Path(app.root_path).parent / 'install' / f'data_test_windows.sql', encoding='utf8') as sql_file: