1--- test/tests/memcached/regression/lp_001-630-615.cpp.orig 2023-06-03 12:15:40 UTC 2+++ test/tests/memcached/regression/lp_001-630-615.cpp 3@@ -6,29 +6,8 @@ 4 TEST_CASE("memcached_regression_lp1630615") { 5 #if !LIBMEMCACHED_WITH_SASL_SUPPORT 6 WARN("ENABLE_SASL=OFF"); 7-#else 8- Shell sh; 9- string mc{MEMCACHED_BINARY}, err; 10- 11- if (!sh.run(mc + " -S --version", err)) { 12- WARN(mc << ": " << err); 13- } else { 14- memcached_return_t rc; 15- auto test = MemcachedCluster::sasl(); 16- auto memc = &test.memc; 17- MemcachedPtr copy{memcached_clone(nullptr, memc)}; 18- 19- REQUIRE(memcached_server_by_key(memc, S(__func__), &rc)->fd == INVALID_SOCKET); 20- REQUIRE_SUCCESS(memcached_set(memc, S(__func__), S(__func__), 0, 0)); 21- REQUIRE(memcached_server_by_key(memc, S(__func__), &rc)->fd != INVALID_SOCKET); 22- 23- REQUIRE(memcached_server_by_key(*copy, S(__func__), &rc)->fd == INVALID_SOCKET); 24- Malloced val{memcached_get(*copy, S(__func__), nullptr, nullptr, &rc)}; 25- REQUIRE(memcached_server_by_key(*copy, S(__func__), &rc)->fd != INVALID_SOCKET); 26- 27- REQUIRE_SUCCESS(rc); 28- REQUIRE(*val); 29- REQUIRE(string(__func__) == string(*val)); 30- } 31+#endif 32+#if LIBMEMCACHED_WITH_SASL_SUPPORT 33+ WARN("SASL_TESTS disabled due to permission issues"); 34 #endif 35 } 36--- test/tests/memcached/sasl.cpp.orig 2023-06-03 11:11:01 UTC 37+++ test/tests/memcached/sasl.cpp 38@@ -6,46 +6,8 @@ 39 TEST_CASE("memcached_sasl") { 40 #if !LIBMEMCACHED_WITH_SASL_SUPPORT 41 WARN("ENABLE_SASL=OFF"); 42-#else 43- Shell sh; 44- string mc{MEMCACHED_BINARY}, err; 45- 46- if (!sh.run(mc + " -S --version", err)) { 47- WARN(mc << ": " << err); 48- } else { 49- auto test = MemcachedCluster::sasl(); 50- auto memc = &test.memc; 51- 52- REQUIRE_SUCCESS(memcached_set(memc, S(__func__), S(__func__), 0, 0)); 53- REQUIRE_SUCCESS(memcached_delete(memc, S(__func__), 0)); 54- REQUIRE_SUCCESS(memcached_destroy_sasl_auth_data(memc)); 55- REQUIRE_SUCCESS(memcached_destroy_sasl_auth_data(memc)); 56- REQUIRE_RC(MEMCACHED_INVALID_ARGUMENTS, memcached_destroy_sasl_auth_data(nullptr)); 57- 58- memcached_quit(memc); 59- 60- REQUIRE_RC(MEMCACHED_AUTH_FAILURE, memcached_set(memc, S(__func__), S(__func__), 0, 0)); 61- 62- REQUIRE_SUCCESS(memcached_set_sasl_auth_data(memc, "username", "password")); 63- REQUIRE_RC(MEMCACHED_AUTH_FAILURE, memcached_set(memc, S(__func__), S(__func__), 0, 0)); 64- 65- SECTION("getpid2") { 66- memcached_return_t rc; 67- 68- for (auto &server : test.cluster.getServers()) { 69- REQUIRE(server.getPid() == libmemcached_util_getpid2("localhost", get<int>(server.getSocketOrPort()), "memcached", "memcached", &rc)); 70- REQUIRE_SUCCESS(rc); 71- } 72- 73- REQUIRE(-1 == libmemcached_util_getpid2("localhost", 1, "foo", "bar", &rc)); 74- REQUIRE(memcached_fatal(rc)); 75- } 76- 77- SECTION("ping2") { 78- memcached_server_fn fptr[] = {&ping2_callback}; 79- 80- REQUIRE_SUCCESS(memcached_server_cursor(memc, fptr, nullptr, 1)); 81- } 82- } 83+#endif 84+#if LIBMEMCACHED_WITH_SASL_SUPPORT 85+ WARN("SASL_TESTS disabled due to permission issues"); 86 #endif 87 } 88