Mercurial > p > roundup > code
changeset 8447:d06be9346c68
bug, test: fix tests for trace_id; readd import logging.config
Made save_restore_logging a test level fixture. It was a class level
which worked fine until I started using caplog for tests in the same
class. Due to loading config from dict, the roundup channel was set to
not propagate which broke the new formatting test used for trace_id.
Forgot to update some tests due to change in default format adding
%(trace_id).
Also re-added logging.config import which broke loading logging config
files in configuration.py.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Wed, 17 Sep 2025 00:45:04 -0400 |
| parents | 14c7c07b32d8 |
| children | 3df6b8988074 |
| files | roundup/configuration.py test/test_config.py |
| diffstat | 2 files changed, 15 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/configuration.py Tue Sep 16 22:53:00 2025 -0400 +++ b/roundup/configuration.py Wed Sep 17 00:45:04 2025 -0400 @@ -11,6 +11,7 @@ import errno import getopt import logging +import logging.config import os import re import smtplib
--- a/test/test_config.py Tue Sep 16 22:53:00 2025 -0400 +++ b/test/test_config.py Wed Sep 17 00:45:04 2025 -0400 @@ -422,7 +422,7 @@ def inject_fixtures(self, caplog): self._caplog = caplog - @pytest.fixture(scope="class") + @pytest.fixture(autouse=True) def save_restore_logging(self): """Save logger state and try to restore it after all tests in this class have finished. @@ -461,7 +461,7 @@ # cribbed from configuration.py:init_loggers hdlr = logging.StreamHandler(sys.stdout) formatter = logging.Formatter( - '%(asctime)s %(levelname)s %(message)s') + '%(asctime)s %(trace_id)s %(levelname)s %(message)s') hdlr.setFormatter(formatter) for logger in roundup_loggers: @@ -1019,11 +1019,7 @@ def find_file_occurances(string): return len(re.findall(r'\bFile\b', string)) - config = configuration.CoreConfig() - - config.LOGGING_LEVEL = "DEBUG" - config.init_logging() - + config = configuration.CoreConfig(settings={"LOGGING_LEVEL": "DEBUG"}) # format the record and verify the logformat/trace_id. config._logging_test(None, msg="message") @@ -1036,7 +1032,9 @@ # verify that %(trace_id) was set and substituted # Note: trace_id is not initialized in this test case log_parts = log.split() - self.assertRegex(log_parts[2], r'^[A-Za-z0-9]{22}') + # testing len(shorten_int_uuid(uuid.uuid4().int)) + # for 20000 tests gives range [19,22] + self.assertRegex(log_parts[2], r'^[A-Za-z0-9]{19,22}') self._caplog.clear() # the rest check various values of sinfo and msg formating. @@ -1250,25 +1248,25 @@ # verify config is initalized to defaults self.assertEqual(config['LOGGING_FORMAT'], - '%(asctime)s %(levelname)s %(message)s') + '%(asctime)s %(trace_id)s %(levelname)s %(message)s') # load config config.load(self.dirname) self.assertEqual(config['LOGGING_FORMAT'], - '%(asctime)s %(levelname)s %(message)s') + '%(asctime)s %(trace_id)s %(levelname)s %(message)s') # break config using an incomplete format specifier (no trailing 's') - self.munge_configini(mods=[ ("format = ", "%%(asctime)s %%(levelname) %%(message)s") ], section="[logging]") + self.munge_configini(mods=[ ("format = ", "%%(asctime)s %%(trace_id)s %%(levelname) %%(message)s") ], section="[logging]") # load config with self.assertRaises(configuration.OptionValueError) as cm: config.load(self.dirname) - self.assertIn('Unrecognized use of %(...) in: %(levelname)', + self.assertIn('Unrecognized use of %(...) in: %(levelname)', cm.exception.args[2]) - # break config by not dubling % sign to quote it from configparser - self.munge_configini(mods=[ ("format = ", "%(asctime)s %%(levelname) %%(message)s") ], section="[logging]") + # break config by not doubling % sign to quote it from configparser + self.munge_configini(mods=[ ("format = ", "%(asctime)s %%(trace_id)s %%(levelname) %%(message)s") ], section="[logging]") with self.assertRaises( configuration.ParsingOptionError) as cm: @@ -1279,8 +1277,8 @@ "[logging] at option format: Bad value substitution: " "option 'format' in section 'logging' contains an " "interpolation key 'asctime' which is not a valid " - "option name. Raw value: '%(asctime)s %%(levelname) " - "%%(message)s'") + "option name. Raw value: '%(asctime)s %%(trace_id)s " + "%%(levelname) %%(message)s'") def testDictLoggerConfigViaJson(self):