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

fix kerberos test and mxs1516 test

Browse Source
This commit is contained in:
Timofey Turenko 2017-08-08 19:13:37 +03:00 committed by Timofey Turenko
parent 6dcc71d862
commit 2c04adafd1
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
maxscale-system-test/kerberos_setup.cpp
View File

@ -14,6 +14,7 @@ int main(int argc, char *argv[])
TestConnections * Test = new TestConnections(argc, argv);
Test->set_timeout(1000);
char str[1024];
char str1[1024];
int i;
@ -32,23 +33,27 @@ int main(int argc, char *argv[])
sprintf(str, "%s/krb5.conf", test_dir);
for (i = 0; i < Test->repl->N; i++)
{
Test->repl->ssh_node(i, true, "yum clean all");
Test->repl->ssh_node(i, true, "yum install -y MariaDB-gssapi-server MariaDB-gssapi-client krb5-workstation pam_krb5");
Test->repl->copy_to_node(str, (char *) "~/", i);
Test->repl->ssh_node(i, true, "cp ~/krb5.conf /etc/");
Test->repl->copy_to_node(str, Test->repl->access_homedir[i], i);
sprintf(str1, "cp %s/krb5.conf /etc/", Test->repl->access_homedir[i]);
Test->repl->ssh_node(i, true, str1);
Test->repl->copy_to_node((char *) "hosts", (char *) "~/", i);
Test->repl->ssh_node(i, true, "cp ~/hosts /etc/");
sprintf(str1, "cp %s/hosts /etc/", Test->repl->access_homedir[i]);
Test->repl->ssh_node(i, true, str1);
}
Test->tprintf("Copying 'hosts' and krb5.conf files to Maxscale node\n");
Test->copy_to_maxscale((char *) "hosts", (char *) "~/");
Test->ssh_maxscale(true, (char *) "cp ~/hosts /etc/");
Test->copy_to_maxscale((char *) "hosts", Test->maxscale_access_homedir);
Test->ssh_maxscale(true, (char *) "cp %s/hosts /etc/", Test->maxscale_access_homedir);
Test->copy_to_maxscale(str, (char *) "~/");
Test->ssh_maxscale(true, (char *) "cp ~/krb5.conf /etc/");
Test->copy_to_maxscale(str, Test->maxscale_access_homedir);
Test->ssh_maxscale(true, (char *) "cp %s/krb5.conf /etc/", Test->maxscale_access_homedir);
Test->tprintf("Instaling Kerberos server packages to Maxscale node\n");
Test->ssh_maxscale(true, (char *) "yum clean all");
Test->ssh_maxscale(true, (char *) "yum install rng-tools -y");
Test->ssh_maxscale(true, (char *) "rngd -r /dev/urandom -o /dev/random");
@ -84,6 +89,7 @@ int main(int argc, char *argv[])
Test->ssh_maxscale(true, (char *) "chmod a+r /etc/krb5.keytab;");
Test->ssh_maxscale(false, (char *) "kinit mariadb/maxscale.test@MAXSCALE.TEST -k -t /etc/krb5.keytab");
Test->ssh_maxscale(true, (char *) "mkdir -p /home/maxscale");
Test->ssh_maxscale(true, (char *)
"su maxscale --login -s /bin/sh -c \"kinit mariadb/maxscale.test@MAXSCALE.TEST -k -t /etc/krb5.keytab\"");
@ -94,11 +100,13 @@ int main(int argc, char *argv[])
for (i = 0; i < Test->repl->N; i++)
{
sprintf(str, "%s/kerb.cnf", test_dir);
Test->repl->copy_to_node(str, (char *) "~/", i);
Test->repl->ssh_node(i, true, "cp ~/kerb.cnf /etc/my.cnf.d/");
Test->repl->copy_to_node(str, Test->repl->access_homedir[i], i);
sprintf(str, "cp %s/kerb.cnf /etc/my.cnf.d/", Test->repl->access_homedir[i]);
Test->repl->ssh_node(i, true, str);
Test->repl->copy_to_node((char *) "krb5.keytab", (char *) "~/", i);
Test->repl->ssh_node(i, true, "cp ~/krb5.keytab /etc/");
Test->repl->copy_to_node((char *) "krb5.keytab", Test->repl->access_homedir[i], i);
sprintf(str, "cp %s/krb5.keytab /etc/", Test->repl->access_homedir[i]);
Test->repl->ssh_node(i, true, str);
Test->repl->ssh_node(i, false, "kinit mariadb/maxscale.test@MAXSCALE.TEST -k -t /etc/krb5.keytab");
}
@ -131,6 +139,11 @@ int main(int argc, char *argv[])
"echo select User,Host from mysql.user | mysql -uusr1 -h maxscale.maxscale.test -P 4009"),
"Error executing query against Read Connection Slave\n");
for (int i = 0; i < Test->repl->N; i++)
{
Test->repl->ssh_node(i, true, "sudo rm -f /etc/my.cnf.d/kerb.cnf");
}
int rval = Test->global_result;
delete Test;
return rval;

3
maxscale-system-test/mxs1516.cpp
View File

@ -17,6 +17,9 @@ int main(int argc, char** argv)
test.repl->connect();
test.repl->change_master(1, 0);
// Give the monitor some time to detect it
sleep(5);
test.add_result(execute_query_silent(test.conn_master, "SELECT 1") == 0, "Query should fail");
// Change the master back to the original one