rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-16 11:00:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3984 from rgerhards/tb-am_path_python

Browse Source 
testbench: obtain python binary path via AM_PATH_PYTHON
This commit is contained in:
Rainer Gerhards 2019-11-22 16:11:33 +01:00 committed by GitHub
commit 35e3200566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -140,6 +140,7 @@ AM_CONDITIONAL(OS_APPLE, test x$os_type == xapple)
AM_CONDITIONAL(OS_LINUX, test x$os_type == xlinux)
AM_CONDITIONAL(OS_AIX, test x$os_type == xaix)
AM_PATH_PYTHON(,, [:])
# Running from git source?
in_git_src=no
@ -2527,6 +2528,7 @@ AC_CONFIG_FILES([Makefile \
contrib/mmtaghostname/Makefile \
contrib/imdocker/Makefile \
contrib/pmdb2diag/Makefile \
tests/set-envvars \
tests/Makefile])
AC_OUTPUT

1
tests/Makefile.am
View File

@ -1455,6 +1455,7 @@ distclean-local:
rm -rf .dep_cache .dep_wrk
EXTRA_DIST= \
set-envvars.in \
urlencode.py \
dnscache-TTL-0.sh \
dnscache-TTL-0-vg.sh \

17
tests/diag.sh
View File

@ -1448,7 +1448,7 @@ exit_test() {
# to work pretty well. In any case, we should probably call this as
# late as possible before the usage of the port.
get_free_port() {
python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'
$PYTHON -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'
}
@ -1458,7 +1458,7 @@ get_inode() {
printf 'FAIL: file "%s" does not exist in get_inode\n' "$1"
error_exit 100
fi
python -c 'import os; import stat; print(os.lstat("'$1'")[stat.ST_INO])'
$PYTHON -c 'import os; import stat; print(os.lstat("'$1'")[stat.ST_INO])'
}
@ -2059,7 +2059,7 @@ start_elasticsearch() {
es_getdata() {
curl --silent -XPUT --show-error -H 'Content-Type: application/json' "http://localhost:${2:-$ES_PORT}/rsyslog_testbench/_settings" -d '{ "index" : { "max_result_window" : '${1:-$NUMMESSAGES}' } }'
curl --silent localhost:${2:-$ES_PORT}/rsyslog_testbench/_search?size=${1:-$NUMMESSAGES} > $RSYSLOG_DYNNAME.work
python $srcdir/es_response_get_msgnum.py > ${RSYSLOG_OUT_LOG}
$PYTHON $srcdir/es_response_get_msgnum.py > ${RSYSLOG_OUT_LOG}
}
# a standard method to support shutdown & queue empty check for a wide range
@ -2127,7 +2127,7 @@ omhttp_start_server() {
server_args="-p $omhttp_server_port ${*:2}"
python ${omhttp_server_py} ${server_args} >> ${omhttp_server_logfile} 2>&1 &
$PYTHON ${omhttp_server_py} ${server_args} >> ${omhttp_server_logfile} 2>&1 &
if [ ! $? -eq 0 ]; then
echo "Failed to start omhttp test server."
rm -rf $omhttp_work_dir
@ -2191,7 +2191,7 @@ omhttp_get_data() {
omhttp_url="localhost:${omhttp_server_port}/${omhttp_path}"
curl -s ${omhttp_url} \
| python -c "${python_parse}" | sort -n \
| $PYTHON -c "${python_parse}" | sort -n \
> ${RSYSLOG_OUT_LOG}
}
@ -2221,6 +2221,13 @@ first_column_sum_check() {
case $1 in
'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason
echo pwd: $(pwd)
echo srcdir: $srcdir
ls -l set-envvars
echo find:
find $srcdir/.. -name set-envvars
source set-envvars
# for (solaris) load debugging, uncomment next 2 lines:
#export LD_DEBUG=all
#ldd ../tools/rsyslogd

2
tests/es-basic.sh
View File

@ -44,7 +44,7 @@ es_getdata $NUMMESSAGES $ES_PORT
seq_check 0 $(( NUMMESSAGES - 1 ))
rc=0
if [ -f ${RSYSLOG_DYNNAME}.spool/omelasticsearch-stats.log ] ; then
python <${RSYSLOG_DYNNAME}.spool/omelasticsearch-stats.log -c '
$PYTHON <${RSYSLOG_DYNNAME}.spool/omelasticsearch-stats.log -c '
import sys,json
nrecs = int(sys.argv[1])
nrebinds = nrecs/int(sys.argv[2])-1

2
tests/es-bulk-errfile-popul-def-format.sh
View File

@ -45,7 +45,7 @@ startup
shutdown_when_empty
wait_shutdown
python $srcdir/elasticsearch-error-format-check.py default
$PYTHON $srcdir/elasticsearch-error-format-check.py default
if [ $? -ne 0 ]
then
echo "error: Format for error file different! " $?

2
tests/es-bulk-errfile-popul-def-interleaved.sh
View File

@ -47,7 +47,7 @@ startup
shutdown_when_empty
wait_shutdown
python $srcdir/elasticsearch-error-format-check.py interleaved
$PYTHON $srcdir/elasticsearch-error-format-check.py interleaved
if [ $? -ne 0 ]
then

2
tests/es-bulk-errfile-popul-erronly-interleaved.sh
View File

@ -48,7 +48,7 @@ startup
shutdown_when_empty
wait_shutdown
python $srcdir/elasticsearch-error-format-check.py errorinterleaved
$PYTHON $srcdir/elasticsearch-error-format-check.py errorinterleaved
if [ $? -ne 0 ]
then

2
tests/es-bulk-errfile-popul-erronly.sh
View File

@ -47,7 +47,7 @@ startup
shutdown_when_empty
wait_shutdown
python $srcdir/elasticsearch-error-format-check.py erroronly
$PYTHON $srcdir/elasticsearch-error-format-check.py erroronly
if [ $? -ne 0 ]
then

6
tests/es-bulk-retry.sh
View File

@ -114,7 +114,7 @@ curl -s -H 'Content-Type: application/json' -XPUT localhost:${ES_PORT:-19200}/rs
}
}
}
' | python -mjson.tool
' | $PYTHON -mjson.tool
#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
#export RSYSLOG_DEBUGLOG="debug.log"
startup
@ -136,7 +136,7 @@ cleanup_elasticsearch
if [ -f $RSYSLOG_DYNNAME.work ] ; then
< $RSYSLOG_DYNNAME.work \
python -c '
$PYTHON -c '
import sys,json
records = int(sys.argv[1])
extra_recs = open(sys.argv[2], "w")
@ -175,7 +175,7 @@ else
fi
if [ -f ${RSYSLOG_DYNNAME}.spool/es-stats.log ] ; then
python < ${RSYSLOG_DYNNAME}.spool/es-stats.log -c '
$PYTHON < ${RSYSLOG_DYNNAME}.spool/es-stats.log -c '
import sys,json
success = int(sys.argv[1])
badarg = int(sys.argv[2])

2
tests/es-writeoperation.sh
View File

@ -98,7 +98,7 @@ shutdown_when_empty
wait_shutdown
es_getdata 1 $ES_PORT
python <$RSYSLOG_DYNNAME.work -c '
$PYTHON <$RSYSLOG_DYNNAME.work -c '
import sys,json
hsh = json.load(sys.stdin)
try:

6
tests/mmkubernetes-basic-vg.sh
View File

@ -38,7 +38,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="mmk8s_template")
testsrv=mmk8s-test-server
echo starting kubernetes \"emulator\"
timeout 2m python -u $srcdir/mmkubernetes_test_server.py $k8s_srv_port ${RSYSLOG_DYNNAME}${testsrv}.pid ${RSYSLOG_DYNNAME}${testsrv}.started > ${RSYSLOG_DYNNAME}.spool/mmk8s_srv.log 2>&1 &
timeout 2m $PYTHON -u $srcdir/mmkubernetes_test_server.py $k8s_srv_port ${RSYSLOG_DYNNAME}${testsrv}.pid ${RSYSLOG_DYNNAME}${testsrv}.started > ${RSYSLOG_DYNNAME}.spool/mmk8s_srv.log 2>&1 &
BGPROCESS=$!
wait_process_startup ${RSYSLOG_DYNNAME}${testsrv} ${RSYSLOG_DYNNAME}${testsrv}.started
echo background mmkubernetes_test_server.py process id is $BGPROCESS
@ -109,7 +109,7 @@ wait_pid_termination ${RSYSLOG_DYNNAME}${testsrv}.pid
rc=0
# for each record in mmkubernetes-basic.out.json, see if the matching
# record is found in $RSYSLOG_OUT_LOG
python -c 'import sys,json
$PYTHON -c 'import sys,json
k8s_srv_port = sys.argv[3]
expected = {}
for hsh in json.load(open(sys.argv[1])):
@ -143,7 +143,7 @@ grep -q 'mmkubernetes: Too Many Requests: the server is too heavily loaded to pr
grep -q 'mmkubernetes: Too Many Requests: the server is too heavily loaded to provide the data for the requested url .*/pods\\\/pod-name-9-busy' $RSYSLOG_OUT_LOG || { echo fail4; rc=1; }
if [ -f ${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log ] ; then
python <${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log -c '
$PYTHON <${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log -c '
import sys,json
k8s_srv_port = sys.argv[1]
expected = {"name": "mmkubernetes(http://localhost:{0})".format(k8s_srv_port),

6
tests/mmkubernetes-basic.sh
View File

@ -38,7 +38,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="mmk8s_template")
testsrv=mmk8s-test-server
echo starting kubernetes \"emulator\"
timeout 2m python -u $srcdir/mmkubernetes_test_server.py $k8s_srv_port ${RSYSLOG_DYNNAME}${testsrv}.pid ${RSYSLOG_DYNNAME}${testsrv}.started > ${RSYSLOG_DYNNAME}.spool/mmk8s_srv.log 2>&1 &
timeout 2m $PYTHON -u $srcdir/mmkubernetes_test_server.py $k8s_srv_port ${RSYSLOG_DYNNAME}${testsrv}.pid ${RSYSLOG_DYNNAME}${testsrv}.started > ${RSYSLOG_DYNNAME}.spool/mmk8s_srv.log 2>&1 &
BGPROCESS=$!
wait_process_startup ${RSYSLOG_DYNNAME}${testsrv} ${RSYSLOG_DYNNAME}${testsrv}.started
echo background mmkubernetes_test_server.py process id is $BGPROCESS
@ -109,7 +109,7 @@ wait_pid_termination ${RSYSLOG_DYNNAME}${testsrv}.pid
rc=0
# for each record in mmkubernetes-basic.out.json, see if the matching
# record is found in $RSYSLOG_OUT_LOG
python -c 'import sys,json
$PYTHON -c 'import sys,json
k8s_srv_port = sys.argv[3]
expected = {}
for hsh in json.load(open(sys.argv[1])):
@ -143,7 +143,7 @@ grep -q 'mmkubernetes: Too Many Requests: the server is too heavily loaded to pr
grep -q 'mmkubernetes: Too Many Requests: the server is too heavily loaded to provide the data for the requested url .*/pods\\\/pod-name-9-busy' $RSYSLOG_OUT_LOG || { echo fail4; rc=1; }
if [ -f ${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log ] ; then
python <${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log -c '
$PYTHON <${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log -c '
import sys,json
k8s_srv_port = sys.argv[1]
expected = {"name": "mmkubernetes(http://localhost:{0})".format(k8s_srv_port),

6
tests/mmkubernetes-cache-expire.sh
View File

@ -38,7 +38,7 @@ action(type="omfile" file=`echo $RSYSLOG_OUT_LOG` template="mmk8s_template")
testsrv=mmk8s-test-server
echo starting kubernetes \"emulator\"
timeout 2m python -u $srcdir/mmkubernetes_test_server.py $k8s_srv_port ${RSYSLOG_DYNNAME}${testsrv}.pid ${RSYSLOG_DYNNAME}${testsrv}.started > ${RSYSLOG_DYNNAME}.spool/mmk8s_srv.log 2>&1 &
timeout 2m $PYTHON -u $srcdir/mmkubernetes_test_server.py $k8s_srv_port ${RSYSLOG_DYNNAME}${testsrv}.pid ${RSYSLOG_DYNNAME}${testsrv}.started > ${RSYSLOG_DYNNAME}.spool/mmk8s_srv.log 2>&1 &
BGPROCESS=$!
wait_process_startup ${RSYSLOG_DYNNAME}${testsrv} ${RSYSLOG_DYNNAME}${testsrv}.started
echo background mmkubernetes_test_server.py process id is $BGPROCESS
@ -96,7 +96,7 @@ wait_pid_termination ${RSYSLOG_DYNNAME}${testsrv}.pid
rc=0
# for each record in mmkubernetes-cache-expire.out.json, see if the matching
# record is found in $RSYSLOG_OUT_LOG
python -c 'import sys,json
$PYTHON -c 'import sys,json
k8s_srv_port = sys.argv[3]
expected = {}
for hsh in json.load(open(sys.argv[1])):
@ -126,7 +126,7 @@ sys.exit(rc)
' $srcdir/mmkubernetes-cache-expire.out.expected $RSYSLOG_OUT_LOG $k8s_srv_port || rc=$?
if [ -f ${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log ] ; then
python <${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log -c '
$PYTHON <${RSYSLOG_DYNNAME}.spool/mmkubernetes-stats.log -c '
import sys,json
# key is recordseen, value is hash of stats for that record
expectedvalues = {

2
tests/omamqp1-basic.sh
View File

@ -57,7 +57,7 @@ if [ $ii = $timeout ] ; then
error_exit 1
fi
python -c 'import sys
$PYTHON -c 'import sys
inp = file(sys.argv[1],"r").read()
last = 0
idx = inp.find("msgnum:",last)

4
tests/rscript_parse_time.sh
View File

@ -7,8 +7,9 @@
# 'date' command on all of our test systems (think FreeBSD, and Solaris),
# we need a method of converting given date/time strings to UNIX timestamps.
# For that we use an external Python 2.x script to do the job.
. ${srcdir:=.}/diag.sh init
getts="python $srcdir/rscript_parse_time_get-ts.py"
getts="$PYTHON $srcdir/rscript_parse_time_get-ts.py"
# Run the Python script's self-tests
$getts selftest
@ -62,7 +63,6 @@ rfc3164_11_r=$($getts "$rfc3164_11")
rfc3164_12="Dec 25 20:00:00"
rfc3164_12_r=$($getts "$rfc3164_12")
. ${srcdir:=.}/diag.sh init
generate_conf
add_conf '
module(load="../plugins/imtcp/.libs/imtcp")

1
tests/set-envvars.in Normal file
View File

@ -0,0 +1 @@
export PYTHON=@PYTHON@