@@ -66,34 +66,35 @@ impl log::Log for RuntimeLogger {
6666#[ cfg( test) ]
6767mod tests {
6868 use sp_api:: ProvideRuntimeApi ;
69- use std:: { env, str :: FromStr } ;
69+ use std:: env;
7070 use substrate_test_runtime_client:: {
7171 runtime:: TestAPI , DefaultTestClientBuilderExt , TestClientBuilder , TestClientBuilderExt ,
7272 } ;
7373
7474 #[ test]
75- fn ensure_runtime_logger_respects_host_max_log_level ( ) {
75+ fn ensure_runtime_logger_works ( ) {
7676 if env:: var ( "RUN_TEST" ) . is_ok ( ) {
7777 sp_tracing:: try_init_simple ( ) ;
78- log:: set_max_level ( log:: LevelFilter :: from_str ( & env:: var ( "RUST_LOG" ) . unwrap ( ) ) . unwrap ( ) ) ;
7978
8079 let client = TestClientBuilder :: new ( ) . build ( ) ;
8180 let runtime_api = client. runtime_api ( ) ;
8281 runtime_api
8382 . do_trace_log ( client. chain_info ( ) . genesis_hash )
8483 . expect ( "Logging should not fail" ) ;
8584 } else {
86- for ( level, should_print) in & [ ( "trace" , true ) , ( "info" , false ) ] {
85+ for ( level, should_print) in & [ ( "test= trace" , true ) , ( "info" , false ) ] {
8786 let executable = std:: env:: current_exe ( ) . unwrap ( ) ;
8887 let output = std:: process:: Command :: new ( executable)
8988 . env ( "RUN_TEST" , "1" )
9089 . env ( "RUST_LOG" , level)
91- . args ( & [ "--nocapture" , "ensure_runtime_logger_respects_host_max_log_level " ] )
90+ . args ( & [ "--nocapture" , "ensure_runtime_logger_works " ] )
9291 . output ( )
9392 . unwrap ( ) ;
9493
9594 let output = String :: from_utf8 ( output. stderr ) . unwrap ( ) ;
9695 assert ! ( output. contains( "Hey I'm runtime" ) == * should_print) ;
96+ assert ! ( output. contains( "THIS IS TRACING" ) == * should_print) ;
97+ assert ! ( output. contains( "Hey, I'm tracing" ) == * should_print) ;
9798 }
9899 }
99100 }
0 commit comments