From fdd8f6df3cc47c0e10740e3c9aa68ab113d1e55c Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 10 Aug 2014 17:10:35 +0400 Subject: [PATCH] Wait for pid file to appear Should fix some rare bash test failures --- tests/test_shells/bash.ok | 2 +- tests/test_shells/busybox.ok | 2 +- tests/test_shells/dash.ok | 2 +- tests/test_shells/input.bash | 2 +- tests/test_shells/input.busybox | 2 +- tests/test_shells/input.dash | 2 +- tests/test_shells/input.fish | 2 +- tests/test_shells/input.mksh | 2 +- tests/test_shells/input.tcsh | 2 +- tests/test_shells/input.zsh | 2 +- tests/test_shells/mksh.ok | 2 +- tests/test_shells/test.sh | 2 ++ tests/test_shells/waitpid.sh | 4 ++++ tests/test_shells/zsh.daemon.ok | Bin 12361 -> 12372 bytes tests/test_shells/zsh.nodaemon.ok | 2 +- 15 files changed, 18 insertions(+), 12 deletions(-) create mode 100755 tests/test_shells/waitpid.sh diff --git a/tests/test_shells/bash.ok b/tests/test_shells/bash.ok index 5fb00ea1..0ee4e9b6 100644 --- a/tests/test_shells/bash.ok +++ b/tests/test_shells/bash.ok @@ -2,7 +2,7 @@   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"   HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV= -  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & +  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh [1] PID   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s diff --git a/tests/test_shells/busybox.ok b/tests/test_shells/busybox.ok index 350cf6e3..760d7d03 100644 --- a/tests/test_shells/busybox.ok +++ b/tests/test_shells/busybox.ok @@ -2,7 +2,7 @@   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"   HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV= -  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & +  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s [1]+ Terminated bgscript.sh diff --git a/tests/test_shells/dash.ok b/tests/test_shells/dash.ok index 7ab16d04..2ad24b25 100644 --- a/tests/test_shells/dash.ok +++ b/tests/test_shells/dash.ok @@ -2,7 +2,7 @@   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"   HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV= -  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & +  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1s [1] + Terminated bgscript.sh diff --git a/tests/test_shells/input.bash b/tests/test_shells/input.bash index 3842c75f..47042cf9 100644 --- a/tests/test_shells/input.bash +++ b/tests/test_shells/input.bash @@ -8,7 +8,7 @@ cd .git cd .. VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV= -bgscript.sh & +bgscript.sh & waitpid.sh false kill `cat pid` ; sleep 1s cd "$DIR1" diff --git a/tests/test_shells/input.busybox b/tests/test_shells/input.busybox index bfe0f315..d5b11b12 100644 --- a/tests/test_shells/input.busybox +++ b/tests/test_shells/input.busybox @@ -8,7 +8,7 @@ cd .git cd .. VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV= -bgscript.sh & +bgscript.sh & waitpid.sh false kill `cat pid` ; sleep 1s cd "$DIR1" diff --git a/tests/test_shells/input.dash b/tests/test_shells/input.dash index bfe0f315..d5b11b12 100644 --- a/tests/test_shells/input.dash +++ b/tests/test_shells/input.dash @@ -8,7 +8,7 @@ cd .git cd .. VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV= -bgscript.sh & +bgscript.sh & waitpid.sh false kill `cat pid` ; sleep 1s cd "$DIR1" diff --git a/tests/test_shells/input.fish b/tests/test_shells/input.fish index 1ffc8f11..eda074e9 100644 --- a/tests/test_shells/input.fish +++ b/tests/test_shells/input.fish @@ -9,7 +9,7 @@ cd .git cd .. setenv VIRTUAL_ENV "$HOME/.virtenvs/some-virtual-environment" setenv VIRTUAL_ENV -bgscript.sh & +bgscript.sh & waitpid.sh false kill (cat pid) ; sleep 1s cd "$DIR1" diff --git a/tests/test_shells/input.mksh b/tests/test_shells/input.mksh index 52c1e59f..0b0b4904 100644 --- a/tests/test_shells/input.mksh +++ b/tests/test_shells/input.mksh @@ -8,7 +8,7 @@ cd .git cd .. VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV= -bgscript.sh & +bgscript.sh & waitpid.sh false kill `cat pid` ; sleep 1 cd "$DIR1" diff --git a/tests/test_shells/input.tcsh b/tests/test_shells/input.tcsh index a888b10f..297cff9c 100644 --- a/tests/test_shells/input.tcsh +++ b/tests/test_shells/input.tcsh @@ -6,7 +6,7 @@ cd .git cd .. setenv VIRTUAL_ENV "/home/foo/.virtenvs/some-virtual-environment" unsetenv VIRTUAL_ENV -bgscript.sh & +bgscript.sh & waitpid.sh false # Warning: currently tcsh bindings do not support job count kill `cat pid` ; sleep 1s cd $DIR1:q diff --git a/tests/test_shells/input.zsh b/tests/test_shells/input.zsh index 2f967499..228a9ca9 100644 --- a/tests/test_shells/input.zsh +++ b/tests/test_shells/input.zsh @@ -14,7 +14,7 @@ cd .git cd .. VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV= -bgscript.sh & +bgscript.sh & waitpid.sh false kill `cat pid` ; sleep 1s cd "$DIR1" diff --git a/tests/test_shells/mksh.ok b/tests/test_shells/mksh.ok index 278d5442..4770aff1 100644 --- a/tests/test_shells/mksh.ok +++ b/tests/test_shells/mksh.ok @@ -3,7 +3,7 @@   HOSTNAME  USER   BRANCH  ⋯  shell  3rd  .git  cd ..   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"   HOSTNAME  USER  ⓔ  some-virtual-environment   BRANCH  ⋯  tests  shell  3rd  VIRTUAL_ENV= -  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & +  HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  bgscript.sh & waitpid.sh [1] PID   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  false   HOSTNAME  USER   BRANCH  ⋯  tests  shell  3rd  1  1  kill `cat pid` ; sleep 1 diff --git a/tests/test_shells/test.sh b/tests/test_shells/test.sh index a1c1a61b..b7302d89 100755 --- a/tests/test_shells/test.sh +++ b/tests/test_shells/test.sh @@ -78,6 +78,7 @@ run_test() { sleep 0.1s done ./tests/test_shells/postproc.py ${TEST_TYPE} ${SH} + rm -f tests/shell/3rd/pid if ! check_screen_log ${TEST_TYPE} ${SH} ; then echo '____________________________________________________________' # Repeat the diff to make it better viewable in travis output @@ -152,6 +153,7 @@ ln -s "$(which bc)" tests/shell/path ln -s "$(which expr)" tests/shell/path ln -s "$(which mktemp)" tests/shell/path ln -s ../../test_shells/bgscript.sh tests/shell/path +ln -s ../../test_shells/waitpid.sh tests/shell/path for pexe in powerline powerline-config ; do if test -e scripts/$pexe ; then ln -s "$PWD/scripts/$pexe" tests/shell/path diff --git a/tests/test_shells/waitpid.sh b/tests/test_shells/waitpid.sh new file mode 100755 index 00000000..8d98e216 --- /dev/null +++ b/tests/test_shells/waitpid.sh @@ -0,0 +1,4 @@ +#!/bin/sh +while ! test -e pid ; do + sleep 0.1s +done diff --git a/tests/test_shells/zsh.daemon.ok b/tests/test_shells/zsh.daemon.ok index 592929cebc6cdd2c640cc3aa3bae3d3cbd9262bf..d57f21828c6a9bf88c39fb4aeac747aae4a596c6 100644 GIT binary patch delta 24 fcmX?^a3x`bA1Aj$d17WsL1v0xamHpp&fjVPef$Zw delta 12 TcmcbTa57