Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sympl
Sympl
Commits
b360794d
Commit
b360794d
authored
Feb 23, 2022
by
Paul Cammish
Browse files
Update mail/sympl/test.d/tc_exim4.rb, ftp/test.d/tc_ftp.rb
parent
eb5c3c08
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
ftp/test.d/tc_ftp.rb
View file @
b360794d
...
...
@@ -19,14 +19,14 @@ class TestFTP < Test::Unit::TestCase
@domain
.
create
()
# Hack to disable TLS enforcement, as the ruby lib doesnt support it
system
'echo 1 > /etc/pure-ftpd/conf/TLS ; s
leep 3
; service pure-ftpd restart ; sleep 3'
system
'echo 1 > /etc/pure-ftpd/conf/TLS ; s
ync
; service pure-ftpd restart ; sleep 3'
end
def
teardown
# Re-enable TLS enforcement
system
'echo 2 > /etc/pure-ftpd/conf/TLS ; s
leep 3
; service pure-ftpd restart ; sleep 3'
system
'echo 2 > /etc/pure-ftpd/conf/TLS ; s
ync
; service pure-ftpd restart ; sleep 3'
#
# Delete the temporary domain
...
...
mail/sympl/test.d/tc_exim4.rb
View file @
b360794d
...
...
@@ -408,7 +408,7 @@ class Exim4ConfigTest < Test::Unit::TestCase
FileUtils
.
touch
(
File
.
join
(
config_dir
,
"antivirus"
))
# Fairly hacky way to ensure clamAV is up and running - stopping it, starting it and waiting for it to say it's loaded sigs
# deals with an annoying race condition under load testing, where it hasnt finished reading sigs before the tests get to it
system
(
'sync ; date=$(date "+%Y-%m-%d %H:%M") ; systemctl reload clamav-daemon.service ; timeout 120 journalctl -u clamav-daemon.service --since="$date" --follow | while read line ; do
echo $line ;
if [ $( echo $line | grep -c "[0-9]* signatures" ) -eq 1 ]; then killall "journalctl" ; fi ; done ; sleep 1'
)
system
(
'sync ; date=$(date "+%Y-%m-%d %H:%M") ; systemctl reload clamav-daemon.service ; timeout 120 journalctl -u clamav-daemon.service --since="$date" --follow | while read line ; do if [ $( echo $line | grep -c "[0-9]* signatures" ) -eq 1 ]; then killall "journalctl" ; fi ; done ; sleep 1'
)
# OK the file is there now, so reject (as per default)
do_acl_script
(
'exim4_acl_tests/antivirus_reject'
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment