tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-28 16:24:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor make_tmp_dir to make_test_root

Browse Source 
This fixes problem with `exit_suite --continue` wiping out tmp directory.
This commit is contained in:
Foo 2017-04-30 22:55:20 +03:00
parent 1303cd1b04
commit 717ae5e428
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/shlib/common.sh
View File

@ -22,7 +22,9 @@ enter_suite() {
} }
exit_suite() { exit_suite() {
rm_tmp_dir if test "$POWERLINE_CURRENT_SUITE" = "$POWERLINE_TMP_DIR_SUITE" ; then
rm_test_root
fi
if test $FAILED -ne 0 ; then if test $FAILED -ne 0 ; then
echo "Suite ${POWERLINE_CURRENT_SUITE} failed, summary:" echo "Suite ${POWERLINE_CURRENT_SUITE} failed, summary:"
echo "${FAIL_SUMMARY}" echo "${FAIL_SUMMARY}"
@ -51,10 +53,11 @@ fail() {
fi fi
} }
make_tmp_dir() { make_test_root() {
local suffix="$1" ; shift local suffix="${POWERLINE_CURRENT_SUITE##*/}"
local tmpdir="$TMP_ROOT/$suffix/" local tmpdir="$TMP_ROOT/$suffix/"
export POWERLINE_TMP_DIR_SUITE="$POWERLINE_CURRENT_SUITE"
if test -d "$tmpdir" ; then if test -d "$tmpdir" ; then
rm -r "$tmpdir" rm -r "$tmpdir"
@ -62,15 +65,17 @@ make_tmp_dir() {
mkdir -p "$tmpdir" mkdir -p "$tmpdir"
printf '%s' "$tmpdir" export TEST_ROOT="$tmpdir"
} }
rm_tmp_dir() { rm_test_root() {
if test -e "$FAILURES_FILE" ; then if test -e "$FAILURES_FILE" ; then
return 0 return 0
fi fi
if test -d "$TMP_ROOT" ; then local suffix="${POWERLINE_CURRENT_SUITE##*/}"
rm -r "$TMP_ROOT" if test -d "$TMP_ROOT/$suffix" ; then
rm -r "$TMP_ROOT/$suffix"
rmdir "$TMP_ROOT" &>/dev/null || true
fi fi
} }

3
tests/test_awesome/test.sh
View File

@ -3,7 +3,8 @@
enter_suite awesome enter_suite awesome
TEST_ROOT="$(make_tmp_dir awesome)" make_test_root
TEST_PATH="$TEST_ROOT/path" TEST_PATH="$TEST_ROOT/path"
TEST_STATIC_ROOT="$ROOT/tests/test_awesome" TEST_STATIC_ROOT="$ROOT/tests/test_awesome"

2
tests/test_bar/test.sh
View File

@ -3,7 +3,7 @@
enter_suite bar enter_suite bar
TEST_ROOT="$(make_tmp_dir bar)" make_test_root
TEST_PATH="$TEST_ROOT/path" TEST_PATH="$TEST_ROOT/path"
TEST_STATIC_ROOT="$ROOT/tests/test_bar" TEST_STATIC_ROOT="$ROOT/tests/test_bar"

6
tests/test_vim/test.sh
View File

@ -4,6 +4,8 @@
enter_suite vim enter_suite vim
make_test_root
# Define some overrides. These ones must be ignored and do not affect Vim # Define some overrides. These ones must be ignored and do not affect Vim
# status/tab lines. # status/tab lines.
export POWERLINE_CONFIG_OVERRIDES='common.default_top_theme=ascii' export POWERLINE_CONFIG_OVERRIDES='common.default_top_theme=ascii'
@ -28,11 +30,9 @@ test_script() {
fi fi
} }
TMPDIR="$(make_tmp_dir vim)"
TEST_SCRIPT_ROOT="$ROOT/tests/test_vim/tests" TEST_SCRIPT_ROOT="$ROOT/tests/test_vim/tests"
cd "$TMPDIR" cd "$TEST_ROOT"
for script in "$TEST_SCRIPT_ROOT"/*.vim ; do for script in "$TEST_SCRIPT_ROOT"/*.vim ; do
if test "${script%.old.vim}" = "${script}" ; then if test "${script%.old.vim}" = "${script}" ; then