From 0171dfbf8198c682af66dfd482e8960c9ee1ffb9 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 13 Jul 2015 13:20:56 +0300 Subject: [PATCH] tests: drop http server from messaging test Not needed, and doesn't compile. --- tests/urchin/message.cc | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tests/urchin/message.cc b/tests/urchin/message.cc index 210108c3e6..71527f4eb9 100644 --- a/tests/urchin/message.cc +++ b/tests/urchin/message.cc @@ -7,7 +7,6 @@ #include "gms/gossip_digest_ack2.hh" #include "gms/gossip_digest.hh" #include "core/sleep.hh" -#include "http/httpd.hh" #include "api/api.hh" using namespace std::chrono_literals; @@ -176,9 +175,8 @@ int main(int ac, char ** av) { ("cpuid", bpo::value()->default_value(0), "Server cpuid"); distributed db; - api::http_context ctx(db); - return app.run(ac, av, [&app, &ctx] { + return app.run(ac, av, [&app] { auto config = app.configuration(); uint16_t api_port = config["api-port"].as(); bool stay_alive = config["stay-alive"].as(); @@ -186,21 +184,13 @@ int main(int ac, char ** av) { api_port++; } const gms::inet_address listen = gms::inet_address(config["listen-address"].as()); - net::get_messaging_service().start(listen).then([config, api_port, &ctx, stay_alive] () { + net::get_messaging_service().start(listen).then([config, api_port, stay_alive] () { auto testers = new distributed; testers->start().then([testers]{ auto& server = net::get_local_messaging_service(); auto port = server.port(); std::cout << "Messaging server listening on port " << port << " ...\n"; return testers->invoke_on_all(&tester::init_handler); - }).then([api_port, &ctx] { - return ctx.http_server.start(); - }).then([api_port, &ctx] { - return set_server(ctx); - }).then([&ctx, api_port] { - return ctx.http_server.listen(api_port); - }).then([api_port] { - std::cout << "Seastar HTTP server listening on port " << api_port << " ...\n"; }).then([testers, config, stay_alive] { auto t = &testers->local(); if (!config.count("server")) {