[PATCH 06/12] git-remote-mediawiki: support for uploading file in test environment
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:54:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
This will be used for testing git-remote-mediawiki's import feature on a wiki containing media files. Signed-off-by: Simon CATHEBRAS <redacted> Signed-off-by: Julien KHAYAT <redacted> Signed-off-by: Simon Perrat <redacted> Signed-off-by: Charles ROUSSEL <redacted> Signed-off-by: Guillaume SASDY <redacted> Signed-off-by: Matthieu Moy <redacted> --- contrib/mw-to-git/t/install-wiki/LocalSettings.php | 3 ++- contrib/mw-to-git/t/test-gitmw-lib.sh | 3 +++ contrib/mw-to-git/t/test-gitmw.pl | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/contrib/mw-to-git/t/install-wiki/LocalSettings.php b/contrib/mw-to-git/t/install-wiki/LocalSettings.php
index aa72518..29f1251 100644
--- a/contrib/mw-to-git/t/install-wiki/LocalSettings.php
+++ b/contrib/mw-to-git/t/install-wiki/LocalSettings.php@@ -67,9 +67,10 @@ $wgMemCachedServers = array(); ## To enable image uploads, make sure the 'images' directory ## is writable, then set this to true: -$wgEnableUploads = false; +$wgEnableUploads = true; $wgUseImageMagick = true; $wgImageMagickConvertCommand ="@CONVERT@"; +$wgFileExtensions[] = 'txt'; # InstantCommons allows wiki to use images from http://commons.wikimedia.org $wgUseInstantCommons = false;
diff --git a/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh
index 14f6577..3b2cfac 100755
--- a/contrib/mw-to-git/t/test-gitmw-lib.sh
+++ b/contrib/mw-to-git/t/test-gitmw-lib.sh@@ -26,6 +26,9 @@ else WIKI_DIR_INST="$CURR_DIR/$WEB_WWW" fi +wiki_upload_file () { + "$CURR_DIR"/test-gitmw.pl upload_file "$@" +} wiki_getpage () { "$CURR_DIR"/test-gitmw.pl get_page "$@"
diff --git a/contrib/mw-to-git/t/test-gitmw.pl b/contrib/mw-to-git/t/test-gitmw.pl
index 2611991..783dd82 100755
--- a/contrib/mw-to-git/t/test-gitmw.pl
+++ b/contrib/mw-to-git/t/test-gitmw.pl@@ -193,6 +193,21 @@ sub wiki_getallpagename { } } +sub wiki_upload_file { + my $file_name = $_[0]; + my $resultat = $mw->edit ( { + action => 'upload', + filename => $file_name, + comment => 'upload a file', + file => [ $file_name ], + ignorewarnings=>1, + }, { + skip_encoding => 1 + } ) || die $mw->{error}->{code} . ' : ' . $mw->{error}->{details}; +} + + + # Main part of this script: parse the command line arguments # and select which function to execute my $fct_to_call = shift;
@@ -200,6 +215,7 @@ my $fct_to_call = shift; wiki_login($wiki_admin, $wiki_admin_pass); my %functions_to_call = qw( + upload_file wiki_upload_file get_page wiki_getpage delete_page wiki_delete_page edit_page wiki_editpage
--
1.7.11.1.147.g47a574d