Fix zsh issue with background job, some cleanup

This commit is contained in:
Petr Šplíchal 2018-09-19 15:41:41 +02:00
commit e26ecb964f

View file

@ -25,18 +25,19 @@ PACKAGES=${PACKAGES:-bash}
SH_BIN=${SH_BIN:-bash}
rlJournalStart
rlPhaseStartSetup "Init phase"
rlAssertRpm --all
if [ $SH_BIN == "zsh" ]; then
ZSH_OPT="-i"
ZSH_OPT="-i"
# Without this there might be some issue when starting background
echo "unsetopt monitor" >> /etc/zshrc
else
ZSH_OPT=""
ZSH_OPT=""
fi
rlPhaseEnd
rlPhaseStartTest "Test of functions"
rlRun "${SH_BIN} -c 'true'" 0 "True action"
rlRun "${SH_BIN} -c pwd" 0 "Checking if ${SH_BIN} do pwd command"
rlRun "${SH_BIN} -c unexistcommand3241" 127 "Checking if ${SH_BIN} return 127 if command doesnt exist"
rm /tmp/unexistfile &>/dev/null
@ -46,17 +47,14 @@ rlJournalStart
TEXT=sometihngverylong
rlRun "${SH_BIN} -c 'echo $TEXT > $TT; cat $TT |grep -q $TEXT'" 0 "Checking redirecting to file"
rlRun " ${SH_BIN} -c 'let a=1+1;echo \$a|grep -q 2'" 0 "Checking 'let' arithmetic operation 1+1"
# rlRun "${SH_BIN} -c 'sleep 100&; WC=\`jobs|wc -l\`; [[ \$WC -ge 1 ]]'" 0 "Checking process at background is running"
rlRun "${SH_BIN} $ZSH_OPT -c 'sleep 100& WC=\$(jobs|wc -l) ; [[ \$WC -ge 1 ]]'" 0 "Checking process at background is running"
rlRun "${SH_BIN} $ZSH_OPT -c 'sleep 100 & jobs > jobs.out; WC=\$(cat jobs.out|wc -l); [[ \$WC -ge 1 ]]'" 0 \
"Checking process at background is running"
USER=${SH_BIN}user
rlRun "adduser -s /bin/${SH_BIN} $USER" 0,9 "Created user with ${SH_BIN} as default shell"
rlRun "su -l $USER -c 'echo \$PATH'" 0 "Logged as previous created user and run echo PATH"
rlPhaseEnd
# cleanup
rlPhaseStartCleanup "Cleaning up"
rlRun "true" 0 "True action"
rlRun "rm $TT" 0 "Checking delete of $TT"
sleep 10
rlRun "userdel $USER" 0 "Deleted user with ${SH_BIN} as default shell"