88import random
99import re
1010import string
11- import sys
1211import time
1312from collections import namedtuple
1413from threading import Thread
@@ -418,7 +417,6 @@ def handler(event, context):
418417 assert "stack_trace" not in log
419418
420419
421- @pytest .mark .skipif (reason = "Test temporarily disabled" )
422420def test_thread_safe_keys_encapsulation (service_name , stdout ):
423421 logger = Logger (
424422 service = service_name ,
@@ -434,9 +432,16 @@ def send_thread_message_with_key(message, keys):
434432 logger .info ("global key added" )
435433
436434 thread1_keys = {"exampleThread1Key" : "thread1" }
437- Thread (target = send_thread_message_with_key , args = ("thread1" , thread1_keys )).start ()
435+ thread1 = Thread (target = send_thread_message_with_key , args = ("thread1" , thread1_keys ))
436+
437+ thread1 .start ()
438+ thread1 .join ()
439+
438440 thread2_keys = {"exampleThread2Key" : "thread2" }
439- Thread (target = send_thread_message_with_key , args = ("thread2" , thread2_keys )).start ()
441+ thread2 = Thread (target = send_thread_message_with_key , args = ("thread2" , thread2_keys ))
442+
443+ thread2 .start ()
444+ thread2 .join ()
440445
441446 logger .info ("final log, all thread keys gone" )
442447
@@ -457,7 +462,6 @@ def send_thread_message_with_key(message, keys):
457462 assert logs [3 ].get ("exampleThread2Key" ) is None
458463
459464
460- @pytest .mark .skipif (sys .version_info >= (3 , 13 ), reason = "Test temporarily disabled for Python 3.13+" )
461465def test_thread_safe_remove_key (service_name , stdout ):
462466 logger = Logger (
463467 service = service_name ,
@@ -471,10 +475,12 @@ def send_message_with_key_and_without(message, keys):
471475 logger .info (message )
472476
473477 thread1_keys = {"exampleThread1Key" : "thread1" }
474- Thread (target = send_message_with_key_and_without , args = ("msg" , thread1_keys )).start ()
478+ thread1 = Thread (target = send_message_with_key_and_without , args = ("msg" , thread1_keys ))
479+
480+ thread1 .start ()
481+ thread1 .join ()
475482
476483 logs = capture_logging_output (stdout )
477- print (logs )
478484
479485 assert logs [0 ].get ("exampleThread1Key" ) == "thread1"
480486 assert logs [1 ].get ("exampleThread1Key" ) is None
@@ -493,10 +499,12 @@ def send_message_with_key_and_clear(message, keys):
493499 logger .info (message )
494500
495501 thread1_keys = {"exampleThread1Key" : "thread1" }
496- Thread (target = send_message_with_key_and_clear , args = ("msg" , thread1_keys )).start ()
502+ thread1 = Thread (target = send_message_with_key_and_clear , args = ("msg" , thread1_keys ))
503+
504+ thread1 .start ()
505+ thread1 .join ()
497506
498507 logs = capture_logging_output (stdout )
499- print (logs )
500508
501509 assert logs [0 ].get ("exampleThread1Key" ) == "thread1"
502510 assert logs [1 ].get ("exampleThread1Key" ) is None
@@ -513,10 +521,12 @@ def send_message_with_key_and_get(message, keys):
513521 logger .info (logger .thread_safe_get_current_keys ())
514522
515523 thread1_keys = {"exampleThread1Key" : "thread1" }
516- Thread (target = send_message_with_key_and_get , args = ("msg" , thread1_keys )).start ()
524+ thread1 = Thread (target = send_message_with_key_and_get , args = ("msg" , thread1_keys ))
525+
526+ thread1 .start ()
527+ thread1 .join ()
517528
518529 logs = capture_logging_output (stdout )
519- print (logs )
520530
521531 assert logs [0 ].get ("exampleThread1Key" ) == "thread1"
522532 assert logs [0 ].get ("message" ) == thread1_keys
0 commit comments