diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-04 09:35:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-04 09:35:32 +0200 |
| commit | a2a3c58c6c0d0f4e2cbe053979ed4feb32298ac5 (patch) | |
| tree | 76b853ec29fe2c0768c3092340469505e9a312af | |
| parent | b30e809a202ef42e59a6c9e455e17ce56c7894bc (diff) | |
| download | rsyslog-a2a3c58c6c0d0f4e2cbe053979ed4feb32298ac5.tar.gz rsyslog-a2a3c58c6c0d0f4e2cbe053979ed4feb32298ac5.tar.xz rsyslog-a2a3c58c6c0d0f4e2cbe053979ed4feb32298ac5.zip | |
activated TLS send/receive test in testbench
This was possible because in v6 we do no longer have the TLS startup
delay.
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rwxr-xr-x | tests/sndrcv_drvr.sh | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index bde06bcc..8f3a28de 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,6 +18,7 @@ TESTS += \ imtcp_conndrop.sh \ imtcp_addtlframedelim.sh \ sndrcv.sh \ + sndrcv_tls_anon.sh \ sndrcv_gzip.sh \ sndrcv_udp.sh \ sndrcv_udp_nonstdpt.sh \ @@ -337,6 +338,9 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ sndrcv_gzip.sh \ testsuites/sndrcv_gzip_sender.conf \ testsuites/sndrcv_gzip_rcvr.conf \ + sndrcv_tls_anon.sh \ + testsuites/sndrcv_tls_anon_sender.conf \ + testsuites/sndrcv_tls_anon_rcvr.conf \ pipeaction.sh \ testsuites/pipeaction.conf \ pipe_noreader.sh \ diff --git a/tests/sndrcv_drvr.sh b/tests/sndrcv_drvr.sh index 3d613069..fc123b70 100755 --- a/tests/sndrcv_drvr.sh +++ b/tests/sndrcv_drvr.sh @@ -10,13 +10,6 @@ # names are automatically generated. # So: $1 config file name, $2 number of messages # -# A note on TLS testing: the current testsuite (in git!) already contains -# TLS test cases. However, getting these test cases correct is not simple. -# That's not a problem with the code itself, but rater a problem with -# synchronization in the test environment. So I have deciced to keep the -# TLS tests in, but not yet actually utilize them. This is most probably -# left as an excercise for future (devel) releases. -- rgerhards, 2009-11-11 -# # added 2009-11-11 by Rgerhards # This file is part of the rsyslog project, released under GPLv3 # uncomment for debugging support: @@ -30,21 +23,18 @@ source $srcdir/diag.sh wait-startup #valgrind="valgrind" source $srcdir/diag.sh startup $1_sender.conf 2 source $srcdir/diag.sh wait-startup 2 -# may be needed by TLS (once we do it): sleep 30 # now inject the messages into instance 2. It will connect to instance 1, # and that instance will record the data. source $srcdir/diag.sh tcpflood -m$2 -i1 sleep 2 # make sure all data is received in input buffers # shut down sender when everything is sent, receiver continues to run concurrently -# may be needed by TLS (once we do it): sleep 60 source $srcdir/diag.sh shutdown-when-empty 2 source $srcdir/diag.sh wait-shutdown 2 # now it is time to stop the receiver as well source $srcdir/diag.sh shutdown-when-empty source $srcdir/diag.sh wait-shutdown -# may be needed by TLS (once we do it): sleep 60 # do the final check source $srcdir/diag.sh seq-check 1 $2 source $srcdir/diag.sh exit |