diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2020-09-21 10:39:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-21 19:37:38 (GMT) |
| commit | f8ab018dafc2ecbea29397c2112c9e7156d7f080 (patch) | |
| tree | e204c3e1160954ba4319ff8c4653d9c159f4c953 /contrib/mw-to-git/t | |
| parent | 96653ce3041e87f71a8dbbcfd4cb80424758c8fd (diff) | |
| download | git-f8ab018dafc2ecbea29397c2112c9e7156d7f080.zip git-f8ab018dafc2ecbea29397c2112c9e7156d7f080.tar.gz git-f8ab018dafc2ecbea29397c2112c9e7156d7f080.tar.bz2 | |
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>
Diffstat (limited to 'contrib/mw-to-git/t')
| -rwxr-xr-x | contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh | 5 |
1 files changed, 3 insertions, 2 deletions
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 43580af..6187ec6 100755 --- 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 ' |