Merge pull request #167 from deajan/beta2-platform-tests
Beta2 platform tests
This commit is contained in:
commit
39da290577
|
@ -30,8 +30,8 @@
|
|||
#### OFUNCTIONS FULL SUBSET ####
|
||||
#### OFUNCTIONS MINI SUBSET ####
|
||||
#### OFUNCTIONS MICRO SUBSET ####
|
||||
_OFUNCTIONS_VERSION=2.3.0-RC2
|
||||
_OFUNCTIONS_BUILD=2019031502
|
||||
_OFUNCTIONS_VERSION=2.3.0-dev-postRC2
|
||||
_OFUNCTIONS_BUILD=2019052103
|
||||
#### _OFUNCTIONS_BOOTSTRAP SUBSET ####
|
||||
_OFUNCTIONS_BOOTSTRAP=true
|
||||
#### _OFUNCTIONS_BOOTSTRAP SUBSET END ####
|
||||
|
@ -1700,7 +1700,7 @@ GetOs
|
|||
|
||||
ENDSSH
|
||||
if [ $? -ne 0 ]; then
|
||||
Logger "Cannot connect to remote system [$REMOTE_HOST] port [$REMOTE_PORT]." "CRITICAL"
|
||||
Logger "Cannot connect to remote system [$REMOTE_HOST] port [$REMOTE_PORT] as [$REMOTE_USER]." "CRITICAL"
|
||||
if [ -f "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID.$TSTAMP" ]; then
|
||||
Logger "$(cat "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.$SCRIPT_PID.$TSTAMP")" "ERROR"
|
||||
fi
|
||||
|
@ -2123,8 +2123,22 @@ function InitLocalOSDependingSettings {
|
|||
## Getting running processes is quite different
|
||||
## Ping command is not the same
|
||||
if [ "$LOCAL_OS" == "msys" ] || [ "$LOCAL_OS" == "Cygwin" ] || [ "$LOCAL_OS" == "Microsoft" ] || [ "$LOCAL_OS" == "WinNT10" ]; then
|
||||
FIND_CMD=$(dirname $BASH)/find
|
||||
PING_CMD='$SYSTEMROOT\system32\ping -n 2'
|
||||
|
||||
# Newer bash on Win10 finally uses integrated find command instead of windows one
|
||||
if [ -f "/usr/bin/find" ]; then
|
||||
FIND_CMD="/usr/bin/find"
|
||||
elif [ -f "/bin/find" ]; then
|
||||
FIND_CMD="/bin/find"
|
||||
else
|
||||
FIND_CMD="$(dirname $BASH)/find"
|
||||
fi
|
||||
|
||||
# Newer bash on Windows 10 uses integrated ping whereas cygwin & msys use Windows version
|
||||
if [ "$LOCAL_OS" == "WinNT10" ]; then
|
||||
PING_CMD="ping -c 2 -i 1"
|
||||
else
|
||||
PING_CMD='$SYSTEMROOT\system32\ping -n 2'
|
||||
fi
|
||||
|
||||
# On BSD, when not root, min ping interval is 1s
|
||||
elif [ "$LOCAL_OS" == "BSD" ] && [ "$LOCAL_USER" != "root" ]; then
|
||||
|
|
|
@ -16,7 +16,7 @@ INITIATOR_SYNC_DIR="${HOME}/osync-tests/initiator"
|
|||
|
||||
## Target is the system osync synchronizes to (can be the same system as the initiator in case of local sync tasks). The target directory can be a local or remote path.
|
||||
#TARGET_SYNC_DIR="${HOME}/osync-tests/target"
|
||||
TARGET_SYNC_DIR="ssh://root@localhost:44999/${HOME}/osync-tests/target"
|
||||
TARGET_SYNC_DIR="ssh://root@localhost:22/${HOME}/osync-tests/target"
|
||||
|
||||
## If the target system is remote, you can specify a RSA key (please use full path). If not defined, the default ~/.ssh/id_rsa will be used. See documentation for further information.
|
||||
SSH_RSA_PRIVATE_KEY="${HOME}/.ssh/id_rsa_local"
|
||||
|
|
Loading…
Reference in New Issue