From 763328a2acd259c252e6bbf4781c951921aca3e5 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sat, 22 Aug 2020 09:12:16 +0200 Subject: [PATCH] tests: attempt to fix kill test --- tests/libmemcached-1.0/all_tests.h | 2 +- tests/libmemcached-1.0/mem_functions.cc | 4 ++-- tests/libmemcached-1.0/mem_functions.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/libmemcached-1.0/all_tests.h b/tests/libmemcached-1.0/all_tests.h index 3552f3dc..a0903431 100644 --- a/tests/libmemcached-1.0/all_tests.h +++ b/tests/libmemcached-1.0/all_tests.h @@ -128,7 +128,7 @@ test_st touch_tests[] ={ }; test_st kill_TESTS[] ={ - {"kill(HUP)", 0, (test_callback_fn*)kill_HUP_TEST}, + {"kill()", 0, (test_callback_fn*)kill_TEST}, {0, 0, 0} }; diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index 23dea417..090c90d9 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -5060,7 +5060,7 @@ test_return_t regression_bug_(memcached_st *memc) return TEST_SUCCESS; } -test_return_t kill_HUP_TEST(memcached_st *original_memc) +test_return_t kill_TEST(memcached_st *original_memc) { memcached_st *memc= create_single_instance_memcached(original_memc, 0); test_true(memc); @@ -5077,7 +5077,7 @@ test_return_t kill_HUP_TEST(memcached_st *original_memc) test_literal_param(__func__), // Keys test_literal_param(__func__), // Values 0, 0)); - test_true_got(kill(pid, SIGHUP) == 0, strerror(errno)); + test_true_got(kill(pid, SIGTERM) == 0, strerror(errno)); memcached_return_t ret= memcached_set(memc, test_literal_param(__func__), // Keys diff --git a/tests/libmemcached-1.0/mem_functions.h b/tests/libmemcached-1.0/mem_functions.h index 41aea118..04ec19f0 100644 --- a/tests/libmemcached-1.0/mem_functions.h +++ b/tests/libmemcached-1.0/mem_functions.h @@ -180,7 +180,7 @@ test_return_t util_version_test(memcached_st *memc); test_return_t version_string_test(memcached_st *); test_return_t wrong_failure_counter_test(memcached_st *memc); test_return_t wrong_failure_counter_two_test(memcached_st *memc); -test_return_t kill_HUP_TEST(memcached_st *memc); +test_return_t kill_TEST(memcached_st *memc); test_return_t regression_996813_TEST(memcached_st*); test_return_t regression_994772_TEST(memcached_st*); test_return_t regression_1009493_TEST(memcached_st*); -- 2.30.2