From 4c8971cbea68261153797235624dcccb6ee59c9d Mon Sep 17 00:00:00 2001 From: Orsiris de Jong Date: Fri, 9 Jun 2023 15:57:26 +0200 Subject: [PATCH] foo --- dev/tests/run_tests.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 1b4f90d..fd589f8 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -331,20 +331,27 @@ function test_SSH { echo "Testing SSH" failure=false - - echo "ls -alh ${HOME}/.ssh" - ls -alh "${HOME}/.ssh" + + # Testing as "remote user" + homedir=$( getent passwd "${REMOTE_USER}" | cut -d: -f6 ) + echo "ls -alh ${homedir}/.ssh" + ls -alh "${homedir}/.ssh" echo "Running SSH test as ${REMOTE_USER}" # SSH_PORT and SSH_USER are set by oneTimeSetup - $SUDO_CMD ssh -i "${REMOTE_USER}/.ssh/${PRIVKEY_NAME}" -p $SSH_PORT ${REMOTE_USER}@localhost "echo \"Remotely:\"; whoami; echo \"TEST OK\"" + $SUDO_CMD ssh -i "${homedir}/.ssh/${PRIVKEY_NAME}" -p $SSH_PORT ${REMOTE_USER}@localhost "echo \"Remotely:\"; whoami; echo \"TEST OK\"" if [ $? -ne 0 ]; then echo "SSH test failed" failure=true fi + + " Testing as current user + homedir=$( getent passwd "$(whoami)" | cut -d: -f6 ) + echo "ls -alh ${homedir}/.ssh" + ls -alh "${homedir}/.ssh" echo "Running SSH test as $(whoami)" - $SUDO_CMD ssh -i "$(whoami)/.ssh/${PRIVKEY_NAME}" -p $SSH_PORT $(whoami)@localhost "echo \"Remotely:\"; whoami; echo \"TEST OK\"" + $SUDO_CMD ssh -i "$(homedir)/.ssh/${PRIVKEY_NAME}" -p $SSH_PORT $(whoami)@localhost "echo \"Remotely:\"; whoami; echo \"TEST OK\"" if [ $? -ne 0 ]; then echo "SSH test failed" failure=true