X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fmemcached%2Ferrors.cpp;h=377e14d1ba837f15c14a95cd799bc7341cc8160d;hb=4debceb95ebab23b83c7ebcf153bb321d16b4d52;hp=c143b27fbf31c0ee0ecce983dedc26a291a20119;hpb=fd66e60622e8e139753f62454cfdd5be662e39a0;p=awesomized%2Flibmemcached diff --git a/test/tests/memcached/errors.cpp b/test/tests/memcached/errors.cpp index c143b27f..377e14d1 100644 --- a/test/tests/memcached/errors.cpp +++ b/test/tests/memcached/errors.cpp @@ -17,17 +17,13 @@ TEST_CASE("memcached_errors") { } SECTION("dead servers") { - MemcachedCluster test{Cluster{vector{Server{MEMCACHED_BINARY, {"-p", random_port_string("-p")}}}}}; + MemcachedCluster test{Cluster{Server{MEMCACHED_BINARY, {"-p", random_port_string("-p")}}, 1}}; auto memc = &test.memc; REQUIRE_SUCCESS(memcached_set(memc, S("foo"), nullptr, 0, 0, 0)); memcached_quit(memc); - test.cluster.stop( -#if __FreeBSD__ - true // graceful -#endif - ); + test.cluster.stop(); Retry cluster_is_stopped{[&cluster = test.cluster]{ return cluster.isStopped(); }}; @@ -45,7 +41,7 @@ TEST_CASE("memcached_errors") { REQUIRE_RC(MEMCACHED_SERVER_TEMPORARILY_DISABLED, memcached_set(memc, S("foo"), nullptr, 0, 0, 0)); REQUIRE(test.cluster.start()); - REQUIRE(test.isListening()); + REQUIRE(test.cluster.ensureListening()); Retry recovers{[memc]{ return MEMCACHED_SUCCESS == memcached_set(memc, S("foo"), nullptr, 0, 0, 0);