- Redo the servicepool to resolve addresses first time and not loadbalance.

- Make it thread safe.
- Remove any loadbalancing tests
- Assert that no loadbalancing is requested.

1 files changed, 3 insertions, 9 deletions

diff --git a/slobrok/src/tests/configure/configure.cpp b/slobrok/src/tests/configure/configure.cpp
index 579e468db45..aa9826045ef 100644
--- a/slobrok/src/tests/configure/configure.cpp
+++ b/slobrok/src/tests/configure/configure.cpp
@@ -23,9 +23,6 @@ using slobrok::ConfigShim;
 using slobrok::SlobrokServer;
 using slobrok::ConfiguratorFactory;
 
-TEST_SETUP(Test);
-
-
 std::string
 createSpec(int port)
 {
@@ -93,10 +90,7 @@ compare(MirrorAPI &api, const char *pattern, SpecList expect)
     return false;
 }
 
-int
-Test::Main()
-{
-    TEST_INIT("configure_test");
+TEST("configure_test") {
 
     fnet::frt::StandaloneFRT orb1;
     fnet::frt::StandaloneFRT orb2;
@@ -214,10 +208,10 @@ Test::Main()
     serverOne.stop();
     serverTwo.stop();
 
-    TEST_DONE();
-
     orb4.supervisor().GetTransport()->ShutDown(true);
     orb3.supervisor().GetTransport()->ShutDown(true);
     orb2.supervisor().GetTransport()->ShutDown(true);
     orb1.supervisor().GetTransport()->ShutDown(true);
 }
+
+TEST_MAIN() { TEST_RUN_ALL(); }
\ No newline at end of file