hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1717: Fix test regressions

Browse Source 
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.
This commit is contained in:
Markus Mäkelä
2018-03-15 23:12:34 +02:00
parent d7c1d76065
commit 07cca088c9
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/bug673.cpp
View File

@ -18,9 +18,9 @@ int main(int argc, char *argv[])
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
char result[1024]; 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"); "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"); "New style objects in maxadmin commands should succeed");
} }

10
server/core/adminusers.cc
View File

@ -523,10 +523,7 @@ void dcb_PrintAdminUsers(DCB *dcb)
{ {
users_diagnostic(dcb, linux_users); users_diagnostic(dcb, linux_users);
} }
else dcb_printf(dcb, "\n");
{
dcb_printf(dcb, "\n");
}
dcb_printf(dcb, "Created network accounts (insecure): "); dcb_printf(dcb, "Created network accounts (insecure): ");
@ -534,8 +531,5 @@ void dcb_PrintAdminUsers(DCB *dcb)
{ {
users_diagnostic(dcb, inet_users); users_diagnostic(dcb, inet_users);
} }
else dcb_printf(dcb, "\n");
{
dcb_printf(dcb, "\n");
}
} }