diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2016-12-18 13:37:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-18 13:01:20 -0800 |
| commit | 7eeda8b8214bfd171f9ed1265ecc5bfa1d06c607 (patch) | |
| tree | 485572067fc7e3440d50d27a7b97b4b9fd8378de /t/t0021-conversion.sh | |
| parent | c6b0831c9c1718b552872953b4949cef7d4726fe (diff) | |
| download | git-7eeda8b8214bfd171f9ed1265ecc5bfa1d06c607.tar.gz | |
t0021: fix flaky testls/filter-process
t0021.15 creates files, adds them to the index, and commits them. All
this usually happens in a test run within the same second and Git cannot
know if the files have been changed between `add` and `commit`. Thus,
Git has to run the clean filter in both operations. Sometimes these
invocations spread over two different seconds and Git can infer that the
files were not changed between `add` and `commit` based on their
modification timestamp. The test would fail as it expects the filter
invocation. Remove this expectation to make the test stable.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0021-conversion.sh')
| -rwxr-xr-x | t/t0021-conversion.sh | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index 5ae5ecb0fb..6cc678846e 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -376,22 +376,7 @@ test_expect_success PERL 'required process filter should filter data' ' EOF test_cmp_count expected.log rot13-filter.log && - filter_git commit . -m "test commit 2" && - cat >expected.log <<-EOF && - START - init handshake complete - IN: clean test.r $S [OK] -- OUT: $S . [OK] - IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK] - IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] - IN: clean testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] - IN: clean test.r $S [OK] -- OUT: $S . [OK] - IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK] - IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK] - IN: clean testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK] - STOP - EOF - test_cmp_count expected.log rot13-filter.log && - + git commit -m "test commit 2" && rm -f test2.r "testsubdir/test3 '\''sq'\'',\$x=.r" && filter_git checkout --quiet --no-progress . && |