From: Mauro Carvalho Chehab Date: Wed, 18 Mar 2026 09:11:01 +0000 (+0100) Subject: unittests: test_tokenizer: better handle mismatch error X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14b7775ef7471fbb9380048aabb3e96faa1e9123;p=thirdparty%2Fkernel%2Flinux.git unittests: test_tokenizer: better handle mismatch error The current logic is too sensitive to how c_lex name is placed. Also, it doesn't really check the log. Change it to check if the expected message will be reported after a call to C tokenizer with an invalid source. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet Message-ID: <6e19578bc1ffa96e536dc31997ff658017f60173.1773823995.git.mchehab+huawei@kernel.org> --- diff --git a/tools/unittests/test_tokenizer.py b/tools/unittests/test_tokenizer.py index 5634b4a7283e5..d1f3c565b9cf2 100755 --- a/tools/unittests/test_tokenizer.py +++ b/tools/unittests/test_tokenizer.py @@ -46,10 +46,17 @@ def make_tokenizer_test(name, data): # # Check if logger is working # - if "log_level" in data: - with self.assertLogs('kdoc.c_lex', level='ERROR') as cm: + if "log_msg" in data: + with self.assertLogs() as cm: tokenizer = CTokenizer(data["source"]) + msg_found = False + for result in cm.output: + if data["log_msg"] in result: + msg_found = True + + self.assertTrue(msg_found, f"Missing log {data['log_msg']}") + return # @@ -124,7 +131,7 @@ TESTS_TOKENIZER = { "mismatch_error": { "source": "int a$ = 5;", # $ is illegal - "log_level": "ERROR", + "log_msg": "Unexpected token", }, }