diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2019-01-14 12:26:59 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2019-01-14 12:26:59 +0200 |
| commit | f86722c34c92f265bc9a20cb171d2fcfeab7d341 (patch) | |
| tree | e40b5155d3162d6333404190f50cf4d41af1f7f1 | |
| parent | aa0684ce9018a796549ce8a9245cc14307962eae (diff) | |
| download | tar-f86722c34c92f265bc9a20cb171d2fcfeab7d341.tar.gz | |
Fix expected output in dirrem tests.
In both tests, the "file changed as we read it" warning might be
produced for dir/sub, depending on the ctime resolution and timing.
The problem was fixed by 64b43fdf70d82c39eb2ca900cd4f8e49, but regressed
after e7cd377f7801d42aa8e07addff93d2150666c237, which removed 1 second
delays between each pair of checkpoints. Since the presense or absense
of this warning is irrelevant for the test, it is now suppressed.
* tests/dirrem01.at: Suppress the file-changed warning.
* tests/dirrem02.at: Likewise.
| -rw-r--r-- | tests/dirrem01.at | 15 | ||||
| -rw-r--r-- | tests/dirrem02.at | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/tests/dirrem01.at b/tests/dirrem01.at index 0a9c9e51..24bf3925 100644 --- a/tests/dirrem01.at +++ b/tests/dirrem01.at @@ -27,9 +27,13 @@ # it prints a warning and exits with TAREXIT_DIFFERS. # # This test checks whether this behaviour is mimicked for directories, too. - -# Remark: This file is based on 'filerem01.at', which is the test-case for -# a vanishing file. +# +# Notes: +# 1. This file is based on 'filerem01.at', which is the test-case for +# a vanishing file. +# 2. Depending on the stat.st_ctime resolution, the "file changed as we +# read it" warning might be issued for dir/sub. The test takes care to +# suppress it. AT_SETUP([directory removed before reading]) AT_KEYWORDS([create incremental listed dirchange dirrem dirrem01]) @@ -48,13 +52,14 @@ esac genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \ tar --blocking-factor=1 -c -f archive.tar \ - --listed-incremental db -v dir >/dev/null + --listed-incremental db \ + --warning=no-file-changed \ + -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]) diff --git a/tests/dirrem02.at b/tests/dirrem02.at index c314484b..3c63bbeb 100644 --- a/tests/dirrem02.at +++ b/tests/dirrem02.at @@ -45,13 +45,14 @@ esac genfile --run --checkpoint=$CPT --unlink dir/sub/file2 --unlink dir/sub -- \ tar --blocking-factor=1 -c -f archive.tar \ - --listed-incremental db -v dir dir/sub >/dev/null + --listed-incremental db \ + --warning=no-file-changed \ + -v dir dir/sub >/dev/null ], [2], [ignore], [tar: dir: Directory is new tar: dir/sub: Directory is new -tar: dir/sub: file changed as we read it tar: dir/sub: Cannot open: No such file or directory tar: Exiting with failure status due to previous errors ],[],[],[gnu,posix]) |