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

MXS-3417 Move mxs1662_pam_admin-test inside pam_authentication

Browse Source 
The test failed because the linux user it used was not available
on buildbot. Now the test is part of the larger pam_authentication-
test, which sets up the users.
This commit is contained in:
Esa Korhonen
2021-03-23 18:02:53 +02:00
parent d914c01797
commit 7643dd1445
5 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
system-test/pam_authentication.cpp
View File

@ -15,6 +15,7 @@
#include "mariadbmonitor/fail_switch_rejoin_common.cpp"
#include <iostream>
#include <string>
#include <maxtest/envv.hh>
using std::string;
using std::cout;
@ -82,6 +83,7 @@ int main(int argc, char** argv)
if (test.ok())
{
cout << "PAM-plugin installed and users created on all servers. Starting MaxScale.\n";
test.maxscales->restart(0);
}
else
{
@ -176,6 +178,17 @@ int main(int argc, char** argv)
test.maxscales->execute_maxadmin_command(0, "reload dbusers RWSplit-Router");
};
if (test.ok())
{
// First, test that MaxCtrl login with the pam user works.
string cmd = string_printf("-u %s -p %s show maxscale", pam_user, pam_pw);
test.check_maxctrl(cmd);
if (test.ok())
{
cout << "'maxctrl " << cmd << "' works.\n";
}
}
const char create_pam_user_fmt[] = "CREATE OR REPLACE USER '%s'@'%%' IDENTIFIED VIA pam USING '%s';";
if (test.ok())
{