Skip to content

Commit e7fd6fc

Browse files
Fix logging (trace level) in tests
1 parent 5359c98 commit e7fd6fc

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

cmapi/cmapi_server/logging_management.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ def enable_console_logging(logger: logging.Logger) -> None:
104104
def config_cmapi_server_logging():
105105
# add custom level TRACE only for develop purposes
106106
# could be activated using API endpoints or cli tool without relaunching
107-
add_logging_level('TRACE', 5)
107+
if not hasattr(logging, 'TRACE'):
108+
add_logging_level('TRACE', 5)
108109
cherrypy._cplogging.LogManager.error = custom_cherrypy_error
109110
# reconfigure cherrypy.access log message format
110111
# Default access_log_format '{h} {l} {u} {t} "{r}" {s} {b} "{f}" "{a}"'

cmapi/cmapi_server/test/unittest_global.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,14 @@
22
import os
33
import unittest
44
from contextlib import contextmanager
5-
from datetime import datetime, timedelta
65
from shutil import copyfile
76
from tempfile import TemporaryDirectory
87

98
import cherrypy
10-
from cryptography.hazmat.backends import default_backend
11-
from cryptography.hazmat.primitives import serialization
12-
from cryptography.hazmat.primitives.asymmetric import rsa
13-
from cryptography import x509
14-
from cryptography.x509.oid import NameOID
15-
from cryptography.hazmat.primitives import hashes
16-
179
from cmapi_server import helpers
1810
from cmapi_server.constants import CMAPI_CONF_PATH
1911
from cmapi_server.controllers.dispatcher import dispatcher, jsonify_error
12+
from cmapi_server.logging_management import config_cmapi_server_logging
2013
from cmapi_server.managers.process import MCSProcessManager
2114
from cmapi_server.managers.certificate import CertificateManager
2215

@@ -80,6 +73,7 @@ def run(self, result=None):
8073
)
8174
copyfile(cmapi_config_filename, self.cmapi_config_filename)
8275
copyfile(TEST_MCS_CONFIG_FILEPATH, self.mcs_config_filename)
76+
config_cmapi_server_logging()
8377
self.app = cherrypy.tree.mount(
8478
root=None, config=self.cmapi_config_filename
8579
)

0 commit comments

Comments
 (0)