CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-07-26 10:39:01 +02:00
Code Issues Projects Releases Wiki Activity

tests: avoid hang in new test

Browse Source 
* tests/rm/empty-inacc.sh: Ensure we're not reading from stdin
when we're relying on no prompt to proceed.  Also change the
file being tested so that a failure in one test doesn't impact
following tests causing a framework failure.
This commit is contained in:
Pádraig Brady
2023-02-26 18:10:41 +00:00
parent 3ead67dd16
commit 995021cb0c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/rm/empty-inacc.sh
+8 -8
View File
@@ -39,23 +39,23 @@ mkdir -m a-r unreadable2 || framework_failure_
mkdir -m0 inacc2 || framework_failure_
# These would fail for coreutils-9.1 and prior.
rm -d unreadable2 || fail=1
rm -d unreadable2 < /dev/null || fail=1
test -d unreadable2 && fail=1
rm -d inacc2 || fail=1
rm -d inacc2 < /dev/null || fail=1
test -d inacc2 && fail=1
# Test the interactive code paths that are new with 9.2:
mkdir -m0 inacc2 || framework_failure_
mkdir -m0 inacc3 || framework_failure_
echo n | rm ---presume-input-tty -di inacc2 > out 2>&1 || fail=1
echo n | rm ---presume-input-tty -di inacc3 > out 2>&1 || fail=1
# decline: ensure it was not deleted, and the prompt was as expected.
printf "rm: attempt removal of inaccessible directory 'inacc2'? " > exp
test -d inacc2 || fail=1
printf "rm: attempt removal of inaccessible directory 'inacc3'? " > exp
test -d inacc3 || fail=1
compare exp out || fail=1
echo y | rm ---presume-input-tty -di inacc2 > out 2>&1 || fail=1
echo y | rm ---presume-input-tty -di inacc3 > out 2>&1 || fail=1
# accept: ensure it **was** deleted, and the prompt was as expected.
test -d inacc2 && fail=1
test -d inacc3 && fail=1
compare exp out || fail=1
Exit $fail