X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fmemcached%2Fservers.cpp;h=248421b203988fdf26f8629fcc3849c1469fdc34;hb=0d7a3e0e040ddf840d656b61f41419c252debcde;hp=6c66fdbd8dd25011648afd995a06cb3127542938;hpb=b63590f2acbaf04a9e4162130f293b7db9dc8c4d;p=awesomized%2Flibmemcached diff --git a/test/tests/memcached/servers.cpp b/test/tests/memcached/servers.cpp index 6c66fdbd..248421b2 100644 --- a/test/tests/memcached/servers.cpp +++ b/test/tests/memcached/servers.cpp @@ -1,18 +1,6 @@ #include "test/lib/common.hpp" - #include "test/lib/MemcachedCluster.hpp" - -static memcached_return_t server_display_function(const memcached_st *, - const memcached_instance_st * server, - void *context) -{ - if (context) { - auto bigger = reinterpret_cast(context); - REQUIRE(*bigger <= memcached_server_port(server)); - *bigger = memcached_server_port(server); - } - return MEMCACHED_SUCCESS; -} +#include "test/fixtures/callbacks.hpp" TEST_CASE("memcached_servers") { SECTION("memcached_servers_parse") { @@ -60,10 +48,10 @@ TEST_CASE("memcached_servers") { auto local_memc = *memc; LoneReturnMatcher test{local_memc}; size_t bigger = 0; /* Prime the value for the test_true in server_display_function */ - memcached_server_fn callbacks[1]{server_display_function}; + memcached_server_fn callbacks[1]{server_sort_callback}; REQUIRE_SUCCESS(memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1)); - + SECTION("variation 1") { for (uint32_t x = 0; x < 7; x++) { REQUIRE_SUCCESS(memcached_server_add_with_weight(local_memc, "localhost", random_port(), 0));