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
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>

diff --git a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
index 43580af3cf59160b015f0b4315f3469fe4575272..6187ec67faaa23c59d358bc3150b72fc82bd7087 100755 (executable)
--- a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
+++ b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup config' '
        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 &&
        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" &&
        git clone -c remote.origin.mediaimport=true \
                mediawiki::'"$WIKI_URL"' mw_dir_clone &&
        test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt &&
        (cd mw_dir_clone && 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
 '