From f3a7faf0dd8140ac5893c6ce85882574c2f29266 Mon Sep 17 00:00:00 2001 From: deajan Date: Fri, 23 Dec 2016 21:29:02 +0100 Subject: [PATCH] Fixed bogus ssh port on travis --- dev/tests/conf/old.conf | 2 +- dev/tests/run_tests.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev/tests/conf/old.conf b/dev/tests/conf/old.conf index 857544d..252b7f6 100644 --- a/dev/tests/conf/old.conf +++ b/dev/tests/conf/old.conf @@ -32,7 +32,7 @@ REMOTE_BACKUP=yes SSH_RSA_PRIVATE_KEY=${HOME}/.ssh/id_rsa_local REMOTE_USER=root REMOTE_HOST=localhost -REMOTE_PORT=49999 +REMOTE_PORT=22 ## ssh compression should be used unless your remote connection is good enough (LAN) SSH_COMPRESSION=yes ## Check for connectivity to remote host before launching remote backup tasks. Be sure the hosts responds to ping. Failing to ping will skip current task. diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 1c06bd7..37368d2 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -765,6 +765,10 @@ function test_UpgradeConfPullRun () { ./$OBACKUP_UPGRADE "$CONF_DIR/$TMP_OLD_CONF" assertEquals "Conf file upgrade" "0" $? + + # Update remote conf files with SSH port + sed -i.tmp 's#ssh://.*@localhost:[0-9]*/#ssh://'$REMOTE_USER'@localhost:'$SSH_PORT'/#' "$CONF_DIR/$TMP_OLD_CONF" + REMOTE_HOST_PING=$RHOST_PING ./$OBACKUP_EXECUTABLE "$CONF_DIR/$TMP_OLD_CONF" assertEquals "Upgraded conf file execution test" "0" $?