From 07cca088c96f14188fd19e46f29c52a2d9e3ed33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 15 Mar 2018 23:12:34 +0200 Subject: [PATCH] MXS-1717: Fix test regressions Due to the changes done for MXS-1717, the bug673 test had to be adjusted and a newline has to be printed after users_diagnostic is called. --- maxscale-system-test/bug673.cpp | 4 ++-- server/core/adminusers.cc | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/maxscale-system-test/bug673.cpp b/maxscale-system-test/bug673.cpp index 235fd9769..b3d792ef9 100644 --- a/maxscale-system-test/bug673.cpp +++ b/maxscale-system-test/bug673.cpp @@ -18,9 +18,9 @@ int main(int argc, char *argv[]) for (int i = 0; i < 2; i++) { char result[1024]; - test.add_result(test.maxscales->get_maxadmin_param(0, "show dbusers \"RW Split Router\"", "User names:", result), + test.add_result(test.maxscales->ssh_node_f(0, true, "maxadmin show dbusers \"RW Split Router\"|grep 'User names'"), "Old style objects in maxadmin commands should succeed"); - test.add_result(test.maxscales->get_maxadmin_param(0, "show dbusers RW-Split-Router", "User names:", result), + test.add_result(test.maxscales->ssh_node_f(0, true, "maxadmin show dbusers RW-Split-Router|grep 'User names'"), "New style objects in maxadmin commands should succeed"); } diff --git a/server/core/adminusers.cc b/server/core/adminusers.cc index 4f96d6408..dd8d807b2 100644 --- a/server/core/adminusers.cc +++ b/server/core/adminusers.cc @@ -523,10 +523,7 @@ void dcb_PrintAdminUsers(DCB *dcb) { users_diagnostic(dcb, linux_users); } - else - { - dcb_printf(dcb, "\n"); - } + dcb_printf(dcb, "\n"); dcb_printf(dcb, "Created network accounts (insecure): "); @@ -534,8 +531,5 @@ void dcb_PrintAdminUsers(DCB *dcb) { users_diagnostic(dcb, inet_users); } - else - { - dcb_printf(dcb, "\n"); - } + dcb_printf(dcb, "\n"); }