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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Timofey Turenko
2020-12-07 22:16:47 +02:00
parent 1d600a4f10 f9be1d9cb4
commit 8787b5dc81
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
system-test/maxtest/src/testconnections.cc
View File

@ -2204,11 +2204,11 @@ bool TestConnections::test_bad_config(int m, const string& config)
// Set the timeout to prevent hangs with configurations that work // Set the timeout to prevent hangs with configurations that work
set_timeout(20); set_timeout(20);
return maxscales->ssh_node_f(m, int ssh_rc = maxscales->ssh_node_f(m,
true, true,
"cp /tmp/maxscale.cnf /etc/maxscale.cnf; pkill -9 maxscale; " "cp /tmp/maxscale.cnf /etc/maxscale.cnf; pkill -9 maxscale; "
"maxscale -U maxscale -lstdout &> /dev/null && sleep 1 && pkill -9 maxscale") "maxscale -U maxscale -lstdout &> /dev/null && sleep 1 && pkill -9 maxscale");
== 0; return ((ssh_rc == 0) || (ssh_rc == 256));
} }
int TestConnections::call_mdbci(const char* options) int TestConnections::call_mdbci(const char* options)
{ {

4
system-test/mdbci/run_test.sh
View File

@ -66,6 +66,10 @@ mkdir build && cd build
cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug
cd system-test cd system-test
make make
if [ $? != 0 ] ; then
echo "Test code build FAILED! exiting"
exit 1
fi
echo ${test_set} | grep "NAME#" echo ${test_set} | grep "NAME#"
if [ $? == 0 ] ; then if [ $? == 0 ] ; then

5
system-test/mdbci/run_test_vm.sh
View File

@ -93,7 +93,10 @@ scp -i $key $sshopt test_env $me@$ip:~/
ssh -i $key $sshopt $me@$ip "sudo usermod --shell /bin/bash $me" ssh -i $key $sshopt $me@$ip "sudo usermod --shell /bin/bash $me"
ssh -i $key $sshopt $me@$ip "./MaxScale/BUILD/install_test_build_deps.sh" ssh -i $key $sshopt $me@$ip "./MaxScale/BUILD/install_test_build_deps.sh"
ssh -i $key $sshopt $me@$ip ". ./test_env; env; ./MaxScale/system-test/mdbci/run_test.sh" ssh -i $key $sshopt $me@$ip ". ./test_env; env; ./MaxScale/system-test/mdbci/run_test.sh"
if [ $? != 0 ] ; then
echo "Tests execution FAILED! exiting"
exit 1
fi
. ${script_dir}/configure_log_dir.sh . ${script_dir}/configure_log_dir.sh
mkdir -p LOGS mkdir -p LOGS