undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-mediawiki tests: annotate failing tests

Browse Source 
These tests consistently fail for me, and were failing before any of
the changes in this series. As noted in [1] there are some known
intermittent test failures. Let's mark these as failing so we can have
an otherwise passing test suite.

We need to add an extra test_path_is_file() here because since
d572f52a64 ("test_cmp: diagnose incorrect arguments", 2020-08-09)
test_cmp has errored out with a BUG if one of the test arguments
doesn't exist, without that the test would still fail even without
test_expect_failure().

1. https://github.com/Git-Mediawiki/Git-Mediawiki/issues/56

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2020-09-21 12:39:56 +02:00 committed by Junio C Hamano
parent 96653ce304
commit f8ab018daf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
View File

@ -32,7 +32,7 @@ test_expect_success 'setup config' '
test_might_fail git config --global --unset remote.origin.mediaImport test_might_fail git config --global --unset remote.origin.mediaImport
' '
test_expect_success 'git push can upload media (File:) files' ' test_expect_failure 'git push can upload media (File:) files' '
wiki_reset && wiki_reset &&
git clone mediawiki::'"$WIKI_URL"' mw_dir && git clone mediawiki::'"$WIKI_URL"' mw_dir &&
( (
@ -48,13 +48,14 @@ test_expect_success 'git push can upload media (File:) files' '
) )
' '
test_expect_success 'git clone works on previously created wiki with media files' ' test_expect_failure 'git clone works on previously created wiki with media files' '
test_when_finished "rm -rf mw_dir mw_dir_clone" && test_when_finished "rm -rf mw_dir mw_dir_clone" &&
git clone -c remote.origin.mediaimport=true \ git clone -c remote.origin.mediaimport=true \
mediawiki::'"$WIKI_URL"' mw_dir_clone && mediawiki::'"$WIKI_URL"' mw_dir_clone &&
test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt && test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt &&
(cd mw_dir_clone && git checkout HEAD^) && (cd mw_dir_clone && git checkout HEAD^) &&
(cd mw_dir && git checkout HEAD^) && (cd mw_dir && git checkout HEAD^) &&
test_path_is_file mw_dir_clone/Foo.txt &&
test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt
' '