diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-11 20:26:53 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-11 20:26:53 +0000 |
| commit | a616af94767f58c7a8f968007764a791751c3c0b (patch) | |
| tree | 327a8948a9300bce9bfaca9c51bddb7d8ea17268 /slobrok | |
| parent | 11d5079ca3c88977f9866a36b41796647ae2206c (diff) | |
Take full control over the supervisor
Diffstat (limited to 'slobrok')
| -rw-r--r-- | slobrok/src/tests/mirrorapi/mirrorapi.cpp | 8 | ||||
| -rw-r--r-- | slobrok/src/tests/oldapi/old.cpp | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/slobrok/src/tests/mirrorapi/mirrorapi.cpp b/slobrok/src/tests/mirrorapi/mirrorapi.cpp index 23cd201c551..cd6b8ef5f80 100644 --- a/slobrok/src/tests/mirrorapi/mirrorapi.cpp +++ b/slobrok/src/tests/mirrorapi/mirrorapi.cpp @@ -7,6 +7,7 @@ #include <vespa/slobrok/server/slobrokserver.h> #include <vespa/fnet/frt/supervisor.h> #include <vespa/fnet/frt/target.h> +#include <vespa/fnet/transport.h> #include <vespa/log/log.h> LOG_SETUP("mirrorapi_test"); @@ -136,9 +137,12 @@ Test::Main() cloud::config::SlobroksConfig::Slobrok slobrok; slobrok.connectionspec = "tcp/localhost:18501"; specBuilder.slobrok.push_back(slobrok); - fnet::frt::StandaloneFRT server; - MirrorAPI mirror(server.supervisor(), config::ConfigUri::createFromInstance(specBuilder)); + FastOS_ThreadPool threadPool(0x10000); + FNET_Transport transport; + FRT_Supervisor supervisor(&transport); + MirrorAPI mirror(supervisor, config::ConfigUri::createFromInstance(specBuilder)); EXPECT_TRUE(!mirror.ready()); + transport.Start(&threadPool); FastOS_Thread::Sleep(1000); a.reg(); diff --git a/slobrok/src/tests/oldapi/old.cpp b/slobrok/src/tests/oldapi/old.cpp index 26cf94613bd..c3a315c55a9 100644 --- a/slobrok/src/tests/oldapi/old.cpp +++ b/slobrok/src/tests/oldapi/old.cpp @@ -5,6 +5,7 @@ #include <vespa/slobrok/server/slobrokserver.h> #include <vespa/fnet/frt/supervisor.h> #include <vespa/fnet/frt/target.h> +#include <vespa/fnet/transport.h> #include <vespa/log/log.h> LOG_SETUP("mirrorapi_test"); @@ -132,9 +133,12 @@ Test::Main() std::vector<std::string> slobrokSpecs; slobrokSpecs.push_back("tcp/localhost:18531"); - fnet::frt::StandaloneFRT server; - MirrorOld mirror(server.supervisor(), slobrokSpecs); + FastOS_ThreadPool threadPool(0x10000); + FNET_Transport transport; + FRT_Supervisor supervisor(&transport); + MirrorOld mirror(supervisor, slobrokSpecs); EXPECT_TRUE(!mirror.ready()); + transport.Start(&threadPool); FastOS_Thread::Sleep(1000); a.reg(); |