Skip to content

Commit f8ab018

Browse files
avargitster
authored andcommitted
remote-mediawiki tests: annotate failing tests
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 d572f52 ("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. Git-Mediawiki/Git-Mediawiki#56 Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 96653ce commit f8ab018

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ test_expect_success 'setup config' '
3232
test_might_fail git config --global --unset remote.origin.mediaImport
3333
'
3434

35-
test_expect_success 'git push can upload media (File:) files' '
35+
test_expect_failure 'git push can upload media (File:) files' '
3636
wiki_reset &&
3737
git clone mediawiki::'"$WIKI_URL"' mw_dir &&
3838
(
@@ -48,13 +48,14 @@ test_expect_success 'git push can upload media (File:) files' '
4848
)
4949
'
5050

51-
test_expect_success 'git clone works on previously created wiki with media files' '
51+
test_expect_failure 'git clone works on previously created wiki with media files' '
5252
test_when_finished "rm -rf mw_dir mw_dir_clone" &&
5353
git clone -c remote.origin.mediaimport=true \
5454
mediawiki::'"$WIKI_URL"' mw_dir_clone &&
5555
test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt &&
5656
(cd mw_dir_clone && git checkout HEAD^) &&
5757
(cd mw_dir && git checkout HEAD^) &&
58+
test_path_is_file mw_dir_clone/Foo.txt &&
5859
test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt
5960
'
6061

0 commit comments

Comments
 (0)