From 5713fb87bc776b6d7eaa252b70a965c89972e98b Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 2 Apr 2020 11:25:15 +0000
Subject: Add some more info too failing test.

---
 messagebus_test/src/tests/error/cpp-client.cpp |  7 +++----
 messagebus_test/src/tests/error/error.cpp      | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/messagebus_test/src/tests/error/cpp-client.cpp b/messagebus_test/src/tests/error/cpp-client.cpp
index abc7967bfe5..6296253d3df 100644
--- a/messagebus_test/src/tests/error/cpp-client.cpp
+++ b/messagebus_test/src/tests/error/cpp-client.cpp
@@ -7,7 +7,6 @@
 #include <vespa/messagebus/rpcmessagebus.h>
 #include <vespa/messagebus/network/rpcnetworkparams.h>
 #include <vespa/messagebus/testlib/receptor.h>
-#include <vespa/vespalib/util/time.h>
 #include <thread>
 #include <vespa/fastos/app.h>
 
@@ -34,11 +33,11 @@ App::Main()
 
     SourceSession::UP ss = mb.getMessageBus().createSourceSession(src, SourceSessionParams().setTimeout(300s));
     for (int i = 0; i < 10; ++i) {
-        msg.reset(new SimpleMessage("test"));
+        msg = std::make_unique<SimpleMessage>("test");
         msg->getTrace().setLevel(9);
         ss->send(std::move(msg), "test");
         reply = src.getReply(600s); // 10 minutes timeout
-        if (reply.get() == 0) {
+        if ( ! reply) {
             fprintf(stderr, "CPP-CLIENT: no reply\n");
         } else {
             fprintf(stderr, "CPP-CLIENT:\n%s\n",
@@ -49,7 +48,7 @@ App::Main()
         }
         std::this_thread::sleep_for(1s);
     }
-    if (reply.get() == 0) {
+    if ( ! reply) {
         fprintf(stderr, "CPP-CLIENT: no reply\n");
         return 1;
     }
diff --git a/messagebus_test/src/tests/error/error.cpp b/messagebus_test/src/tests/error/error.cpp
index 57f9c82389d..87eb391fc86 100644
--- a/messagebus_test/src/tests/error/error.cpp
+++ b/messagebus_test/src/tests/error/error.cpp
@@ -18,29 +18,29 @@ TEST("error_test") {
     const std::string ctl_script = TEST_PATH("ctl.sh");
     
     { // Make slobrok config
-        EXPECT_TRUE(system("echo slobrok[1] > slobrok.cfg") == 0);
-        EXPECT_TRUE(system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' "
-                                      ">> slobrok.cfg", slobrok.port()).c_str()) == 0);
+        EXPECT_EQUAL(0, system("echo slobrok[1] > slobrok.cfg"));
+        EXPECT_EQUAL(0, system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' "
+                                      ">> slobrok.cfg", slobrok.port()).c_str()));
     }
     { // CPP SERVER
         { // Make routing config
-            EXPECT_TRUE(system(("cat " + routing_template + " | sed 's#session#cpp/session#' > routing.cfg").c_str()) == 0);
+            EXPECT_EQUAL(0, system(("cat " + routing_template + " | sed 's#session#cpp/session#' > routing.cfg").c_str()));
         }
         fprintf(stderr, "STARTING CPP-SERVER\n");
-        EXPECT_TRUE(system((ctl_script + " start server cpp").c_str()) == 0);
-        EXPECT_TRUE(system("./messagebus_test_cpp-client-error_app") == 0);
-        EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0);
-        EXPECT_TRUE(system((ctl_script + " stop server cpp").c_str()) == 0);
+        EXPECT_EQUAL(0, system((ctl_script + " start server cpp").c_str()));
+        EXPECT_EQUAL(0, system("./messagebus_test_cpp-client-error_app"));
+        EXPECT_EQUAL(0, system("../../binref/runjava JavaClient"));
+        EXPECT_EQUAL(0, system((ctl_script + " stop server cpp").c_str()));
     }
     { // JAVA SERVER
         { // Make routing config
-            EXPECT_TRUE(system(("cat " + routing_template + " | sed 's#session#java/session#' > routing.cfg").c_str()) == 0);
+            EXPECT_EQUAL(0, system(("cat " + routing_template + " | sed 's#session#java/session#' > routing.cfg").c_str()));
         }
         fprintf(stderr, "STARTING JAVA-SERVER\n");
-        EXPECT_TRUE(system((ctl_script + " start server java").c_str()) == 0);
-        EXPECT_TRUE(system("./messagebus_test_cpp-client-error_app") == 0);
-        EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0);
-        EXPECT_TRUE(system((ctl_script + " stop server java").c_str()) == 0);
+        EXPECT_EQUAL(0, system((ctl_script + " start server java").c_str()));
+        EXPECT_EQUAL(0, system("./messagebus_test_cpp-client-error_app"));
+        EXPECT_EQUAL(0, system("../../binref/runjava JavaClient"));
+        EXPECT_EQUAL(0, system((ctl_script + " stop server java").c_str()));
     }
 }
 
-- 
cgit v1.2.3