From ba99e00fe8b5ea5821b7eba28434b05900d95b38 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 14 Jan 2019 11:44:01 +0100 Subject: [PATCH] tests: Do not expect /var/log/secure to be there --- tests/port-forwarding/runtest.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/port-forwarding/runtest.sh b/tests/port-forwarding/runtest.sh index 7ee1511..220ed41 100755 --- a/tests/port-forwarding/runtest.sh +++ b/tests/port-forwarding/runtest.sh @@ -39,11 +39,10 @@ SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" rlJournalStart rlPhaseStartSetup rlAssertRpm $PACKAGE - rlFileBackup /etc/ssh/sshd_config /var/log/secure + rlFileBackup /etc/ssh/sshd_config rlRun "useradd -m $USER" rlRun "su - $USER -c \"mkdir .ssh; chmod 700 .ssh; cd .ssh; ssh-keygen -N '' -f id_rsa; cat id_rsa.pub >authorized_keys; chmod 600 authorized_keys\"" rlRun "echo 'LogLevel DEBUG' >>/etc/ssh/sshd_config" - rlRun "echo '' >/var/log/secure" rlServiceStart sshd rlRun "IP=\$( ip a |grep 'scope global' |grep -w inet |cut -d'/' -f1 |awk '{ print \$2 }' |tail -1 )" rlRun "echo 'IP=$IP'" @@ -83,10 +82,9 @@ forwarding_test() { if ! rlGetPhaseState; then rlRun "cat listen.log" rlRun "cat tunnel.log" - rlRun "cat /var/log/secure" fi - rlFileSubmit listen.log tunnel.log /var/log/secure - rlRun "rm -f *.log; echo '' >/var/log/secure" + rlFileSubmit listen.log tunnel.log + rlRun "rm -f *.log;" } rlPhaseStartTest "Local forwarding"