diff options
author | 2016-10-13 11:34:56 -0700 | |
---|---|---|
committer | 2016-10-13 11:34:56 -0700 | |
commit | e76d36d13816dee7776ba9c440b39550f6e4f028 (patch) | |
tree | 75ad6ddf7b92e4bad7c39dc4334fd20ac3f328cb /test/core/end2end/tests/no_logging.c | |
parent | caa904486ee11d7dfc369a48db1bc6dee4f216c3 (diff) | |
parent | 770137b01ded519a78126031cc00b2afc377bb39 (diff) |
Merge master with new tests and fixtures
Diffstat (limited to 'test/core/end2end/tests/no_logging.c')
-rw-r--r-- | test/core/end2end/tests/no_logging.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/test/core/end2end/tests/no_logging.c b/test/core/end2end/tests/no_logging.c index 42fe5b70f7..32d357508b 100644 --- a/test/core/end2end/tests/no_logging.c +++ b/test/core/end2end/tests/no_logging.c @@ -70,6 +70,13 @@ static void test_no_error_log(gpr_log_func_args *args) { } } +static gpr_atm g_log_func = (gpr_atm)gpr_default_log; + +static void log_dispatcher_func(gpr_log_func_args *args) { + gpr_log_func log_func = (gpr_log_func)gpr_atm_no_barrier_load(&g_log_func); + log_func(args); +} + static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config, const char *test_name, grpc_channel_args *client_args, @@ -267,12 +274,12 @@ static void test_invoke_10_simple_requests(grpc_end2end_test_config config) { static void test_no_error_logging_in_entire_process( grpc_end2end_test_config config) { int i; - gpr_set_log_function(test_no_error_log); + gpr_atm_no_barrier_store(&g_log_func, (gpr_atm)test_no_error_log); for (i = 0; i < 10; i++) { test_invoke_simple_request(config); } test_invoke_10_simple_requests(config); - gpr_set_log_function(gpr_default_log); + gpr_atm_no_barrier_store(&g_log_func, (gpr_atm)gpr_default_log); } static void test_no_logging_in_one_request(grpc_end2end_test_config config) { @@ -282,17 +289,19 @@ static void test_no_logging_in_one_request(grpc_end2end_test_config config) { for (i = 0; i < 10; i++) { simple_request_body(f); } - gpr_set_log_function(test_no_log); + gpr_atm_no_barrier_store(&g_log_func, (gpr_atm)test_no_log); simple_request_body(f); - gpr_set_log_function(gpr_default_log); + gpr_atm_no_barrier_store(&g_log_func, (gpr_atm)gpr_default_log); end_test(&f); config.tear_down_data(&f); } void no_logging(grpc_end2end_test_config config) { authority = validate_host_override_string("foo.test.google.fr:1234", config); + gpr_set_log_function(log_dispatcher_func); test_no_logging_in_one_request(config); test_no_error_logging_in_entire_process(config); + gpr_set_log_function(gpr_default_log); } void no_logging_pre_init(void) {} |