diff --git a/reforis_diagnostics/__init__.py b/reforis_diagnostics/__init__.py index 5187618f22ddf677e87e5416212d1c3ba2d9d605..edbbe6fdf7d574583c551f542450fa98c793f39a 100644 --- a/reforis_diagnostics/__init__.py +++ b/reforis_diagnostics/__init__.py @@ -10,8 +10,9 @@ from pathlib import Path from flask import Blueprint, current_app, request, send_file, jsonify from flask_babel import gettext as _ + from reforis.foris_controller_api import APIError -from reforis.foris_controller_api.utils import validate_json +from reforis.foris_controller_api.utils import log_error, validate_json BASE_DIR = Path(__file__).parent @@ -46,7 +47,7 @@ def post_report(): response = current_app.backend.perform('diagnostics', 'prepare_diagnostic', request.json) if not response.get('diag_id'): - current_app.logger.error('Invalid backend response for creating diagnostics report: %s', response) + log_error(current_app, f'Invalid backend response for creating diagnostics report: {response}', request) return jsonify(_('Cannot create diagnostics report')), HTTPStatus.INTERNAL_SERVER_ERROR return jsonify(response), HTTPStatus.ACCEPTED @@ -98,7 +99,7 @@ def delete_report(report_id): 'remove_diagnostic', {'diag_id': report_id}, ) - if not response['result']: - current_app.logger.error('Invalid backend response for deleting diagnostics report: %s', response) + if response.get('result') is not True: + log_error(current_app, f'Invalid backend response for deleting diagnostics report: {response}', request) return jsonify(_('Cannot delete report')), HTTPStatus.INTERNAL_SERVER_ERROR return '', HTTPStatus.NO_CONTENT diff --git a/tests/conftest.py b/tests/conftest.py index d93b0dbc969118d058d0180f990d2c591ecd0ca4..edcb9917b6b2b598e0879894bb2ecd12ce13e175 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,14 +1,11 @@ import pytest -from flask import Flask -from flask_babel import Babel from reforis_diagnostics import blueprint +pytest_plugins = 'reforis.test_utils.fixtures' + + @pytest.fixture(scope='module') -def app(): - app = Flask(__name__) - app.register_blueprint(blueprint) - app.backend = None - Babel(app) - return app +def app(app_with_blueprint): + return app_with_blueprint(blueprint)