summaryrefslogtreecommitdiff
path: root/tests/dirrem01.at
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2018-01-04 18:55:12 +0100
committerSergey Poznyakoff <gray@gnu.org>2018-03-18 08:33:03 +0200
commit64b43fdf70d82c39eb2ca900cd4f8e49b86c2020 (patch)
tree4a10d89973ed13777d3a46e25cf9ffc970e13673 /tests/dirrem01.at
parent7b8efcc7cbd92e608e69087dd6055d03d0bd2519 (diff)
downloadtar-64b43fdf70d82c39eb2ca900cd4f8e49b86c2020.tar.gz
tests: fix race in dirrem01 and dirrem02
Previously the '--checkpoint-action=echo' was triggered after '--checkpoint-action=sleep=1' - so the order of events *usually* was (for --format='gnu'): ... 1. checkpoint handler before write of 'dir/sub' member 2. one-second delay 3. stderr write: 'tar: Write checkpoint 3' 4. write the member 'dir/sub' into the archive 5. check that the member's ctime has not been changed 6. genfile's detecting 'Write checkpoint', doing unlink ... But sometimes, the genfile was fast enough to win the race and unlinked the directory before the member was written into the archive (IOW, the order was 1-2-3-6-4-5). This led to the occasional warning 'tar: dir/sub: file changed as we read it'. Swap the order of 'sleep=1' and 'echo' actions so the genfile utility has (hopefully) enough time to do the unlink before writing the file into the archive (enforce 1-2-3-6-4-5 order). * tests/dirrem01.at: Swap 'sleep=1' and 'echo' actions. * tests/dirrem02.at: Likewise.
Diffstat (limited to 'tests/dirrem01.at')
-rw-r--r--tests/dirrem01.at5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/dirrem01.at b/tests/dirrem01.at
index 40344dc0..dabc206f 100644
--- a/tests/dirrem01.at
+++ b/tests/dirrem01.at
@@ -47,14 +47,15 @@ gnu) CPT=3;;
esac
genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \
- tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='sleep=1' \
- --checkpoint-action='echo' -c -f archive.tar \
+ tar --blocking-factor=1 --checkpoint=1 --checkpoint-action='echo' \
+ --checkpoint-action='sleep=1' -c -f archive.tar \
--listed-incremental db -v dir >/dev/null
],
[1],
[ignore],
[tar: dir: Directory is new
tar: dir/sub: Directory is new
+tar: dir/sub: file changed as we read it
tar: dir/sub: File removed before we read it
],[],[],[gnu,posix])