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

Update mxs729_maxadmin

Browse Source 
The test now expects the correct output.
This commit is contained in:
Markus Mäkelä
2017-08-30 13:07:46 +03:00
parent e6f78bfcb3
commit 5455ffbb7f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maxscale-system-test/mxs729_maxadmin.cpp
View File

@ -16,13 +16,13 @@
using namespace std; using namespace std;
const char * only_root = "Enabled Linux accounts (secure) : \n"; const char * only_root = "Enabled Linux accounts (secure) : root\n";
const char * user_added = "The Linux user %s has successfully been enabled.\n"; const char * user_added = "The Linux user %s has successfully been enabled.\n";
const char * user_removed = "The Linux user %s has successfully been disabled.\n"; const char * user_removed = "The Linux user %s has successfully been disabled.\n";
const char * remove_last_admin = "Cannot remove the last admin account"; const char * remove_last_admin = "Cannot remove the last admin account";
const char * root_added = "User root has been successfully added.\n"; const char * root_added = "User root has been successfully added.\n";
const char * user_and_root = "Enabled Linux accounts (secure) : %s\n"; const char * user_and_root = "Enabled Linux accounts (secure) : %s\n";
const char * user_only = "Enabled Linux accounts (secure) : %s\n"; const char * user_only = "Enabled Linux accounts (secure) : root, %s\n";
void add_remove_maxadmin_user(TestConnections* Test) void add_remove_maxadmin_user(TestConnections* Test)
{ {
@ -56,9 +56,9 @@ void add_remove_maxadmin_user(TestConnections* Test)
Test->tprintf("trying maxadmin with 'root':\n"); Test->tprintf("trying maxadmin with 'root':\n");
int st5 = Test->ssh_maxscale(true, "maxadmin show users"); int st5 = Test->ssh_maxscale(true, "maxadmin show users");
if (st5 == 0) if (st5 != 0)
{ {
Test->add_result(1, "User added and access to MaxAdmin as 'root' is still possible\n"); Test->add_result(1, "User added and access to MaxAdmin as 'root' is not possible\n");
} }
else else
{ {
@ -84,7 +84,7 @@ void add_remove_maxadmin_user(TestConnections* Test)
Test->tprintf("trying to remove user '%s'\n", Test->maxscale_access_user); Test->tprintf("trying to remove user '%s'\n", Test->maxscale_access_user);
char * st8 = Test->ssh_maxscale_output(false, "maxadmin disable account %s", Test->maxscale_access_user); char * st8 = Test->ssh_maxscale_output(false, "maxadmin disable account %s", Test->maxscale_access_user);
if (strstr(st8, remove_last_admin) == NULL) if (strstr(st8, remove_last_admin))
{ {
Test->add_result(1, "Wrong output of disable command: %s", st8); Test->add_result(1, "Wrong output of disable command: %s", st8);
} }
@ -95,9 +95,9 @@ void add_remove_maxadmin_user(TestConnections* Test)
Test->tprintf("Trying with removed user '%s'\n", Test->maxscale_access_user); Test->tprintf("Trying with removed user '%s'\n", Test->maxscale_access_user);
int st9 = Test->ssh_maxscale(false, "maxadmin show users"); int st9 = Test->ssh_maxscale(false, "maxadmin show users");
if (st9 != 0) if (st9 == 0)
{ {
Test->add_result(1, "Last user '%s' should not be removed", Test->maxscale_access_user); Test->add_result(1, "User '%s' should be removed", Test->maxscale_access_user);
} }
else else
{ {