remote-mediawiki tests: annotate failing tests

avar · gitster · commit f8ab018dafc2 · 2020-09-21T12:37:38.000-07:00
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 <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
@@ -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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ test_expect_success 'setup config' '`
`32`	`32`	`test_might_fail git config --global --unset remote.origin.mediaImport`
`33`	`33`	`'`
`34`	`34`
`35`		`-test_expect_success 'git push can upload media (File:) files' '`
	`35`	`+test_expect_failure 'git push can upload media (File:) files' '`
`36`	`36`	`wiki_reset &&`
`37`	`37`	`git clone mediawiki::'"$WIKI_URL"' mw_dir &&`
`38`	`38`	`(`
`@@ -48,13 +48,14 @@ test_expect_success 'git push can upload media (File:) files' '`
`48`	`48`	`)`
`49`	`49`	`'`
`50`	`50`
`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' '`
`52`	`52`	`test_when_finished "rm -rf mw_dir mw_dir_clone" &&`
`53`	`53`	`git clone -c remote.origin.mediaimport=true \`
`54`	`54`	`mediawiki::'"$WIKI_URL"' mw_dir_clone &&`
`55`	`55`	`test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt &&`
`56`	`56`	`(cd mw_dir_clone && git checkout HEAD^) &&`
`57`	`57`	`(cd mw_dir && git checkout HEAD^) &&`
	`58`	`+ test_path_is_file mw_dir_clone/Foo.txt &&`
`58`	`59`	`test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt`
`59`	`60`	`'`
`60`	`61`