[PATCH/RFC]Test environment for Git-MediaWiki

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH/RFC]Test environment for Git-MediaWiki
@ 2012-05-30 16:30 Simon.Cathebras
  2012-05-30 17:04 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
                   ` (5 more replies)
  0 siblings, 6 replies; 22+ messages in thread
From: Simon.Cathebras @ 2012-05-30 16:30 UTC (permalink / raw)
  To: git
  Cc: Matthieu Moy, charles.roussel, julien.khayat, Simon PERRAT,
	Guillaume Sasdy

Hello all,

We are developing the test environment for the Git-MediaWiki project.
For now, we have focused mainly on the environment with some simple test 
cases.

In this version, we have developed a script to install and delete a 
MediaWiki wiki easily.
The environment provides shell functions to manage a wiki (fetch, 
delete, edit a page, compare the content of a page) and a git-mediawiki 
() repository.
There are two simple test cases for git clone.

You can find all the code in our Github: 
https://github.com/Fafinou/git/wiki and how to install and run the tests.

We would like you to give us a lot of comments about our code :)

Note
* In this version we have a binary file "wikidb.sqlite" which contains 
an empty SQLite3 database. We know this is not a good thing to put a 
binary file in a repository so we will change this bad behavior later 
(we will generate the "wikidb.sqlite" file with a http request to the 
config page of MediaWiki)
* We will add simple test cases for pull and push the soonest

Thanks you in advance for your time ;)

-- 
CATHEBRAS Simon

2A-ENSIMAG

Filière Ingéniérie des Systèmes d'Information
Membre Bug-Buster

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH 1/3] Script to install, delete and clear a MediaWiki
  2012-05-30 16:30 [PATCH/RFC]Test environment for Git-MediaWiki Simon.Cathebras
@ 2012-05-30 17:04 ` Simon Cathebras
  2012-05-30 17:04   ` [PATCH 2/3] Test environment of git-remote-mw Simon Cathebras
                     ` (2 more replies)
  2012-05-31 18:13 ` [PATCH 1/2] FIX: t9360. NEW test t9361 for git pull and git push Guillaume Sasdy
                   ` (4 subsequent siblings)
  5 siblings, 3 replies; 22+ messages in thread
From: Simon Cathebras @ 2012-05-30 17:04 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Guillaume.Sasdy,
	Julien.Khayat, Simon.Perrat, Charles Roussel, Julien Khayat,
	Simon Perrat, Guillaume Sasdy

From: Charles Roussel <charles.roussel@ensimag.fr>

install_wiki.sh expects the first argument to be 'install' or 'delete'
'install' installs a MediaWiki on the web's server with SQLite3
'delete' deletes the previously created wiki. Note those
functionnalities are made to be used from the user command line in the
directory /t

install_wiki also defines a function cmd_reset which clear all content
of the previously created wiki. Note this functionnality is made to be
used only by our test function in a subdirectory of t/

Signed-off-by: Simon Cathebras <simon.cathebras@ensimag.imag.fr>
Signed-off-by: Charles Roussel <charles.roussel@ensimag.imag.fr>
Signed-off-by: Julien Khayat <julien.khayat@ensimag.imag.fr>
Signed-off-by: Simon Perrat <simon.perrat@ensimag.imag.fr>
Signed-off-by: Guillaume Sasdy <guillaume.sasdy@gmail.com>
---
 t/install-wiki.sh                |  38 ++++++++++
 t/install-wiki/LocalSettings.php | 129 ++++++++++++++++++++++++++++++++++
 t/install-wiki/wikidb.sqlite     | Bin 0 -> 210944 bytes
 t/test-gitmw-lib.sh              | 147 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 314 insertions(+)
 create mode 100755 t/install-wiki.sh
 create mode 100644 t/install-wiki/LocalSettings.php
 create mode 100644 t/install-wiki/wikidb.sqlite
 create mode 100755 t/test-gitmw-lib.sh
 mode change 100644 => 100755 t/test-lib-functions.sh
 mode change 100644 => 100755 t/test-lib.sh

diff --git a/t/install-wiki.sh b/t/install-wiki.sh
new file mode 100755
index 0000000..725346e
--- /dev/null
+++ b/t/install-wiki.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# This script installs or deletes a MediaWiki on your computer.
+# It requires a web server with PHP and SQLite running. In addition, if you 
+# do not have MediaWiki sources on your computer, the option 'install' 
+# downloads them for you.
+# Please set the CONFIGURATION VARIABLES in ./test-gitmw-lib.sh
+
+. ./test-gitmw-lib.sh
+
+usage () {
+        echo "Usage: "
+        echo "  ./install-wiki.sh <install|delete|--help|-h>"
+        echo "          install: Install a wiki on your computer."
+        echo "          delete: Delete the wiki and all its pages and      content"
+}
+
+
+# Argument: install, delete, --help | -h
+case "$1" in
+	"install")
+		cmd_install
+		exit 0
+		;;
+	"delete")
+		cmd_delete
+		exit 0
+		;;
+	"--help" | "-h")
+		usage
+		exit 0
+		;;
+	*)
+		usage
+		exit 0
+		;;
+esac
+
diff --git a/t/install-wiki/LocalSettings.php b/t/install-wiki/LocalSettings.php
new file mode 100644
index 0000000..c2fe3d5
--- /dev/null
+++ b/t/install-wiki/LocalSettings.php
@@ -0,0 +1,129 @@
+<?php
+# This file was automatically generated by the MediaWiki 1.19.0
+# installer. If you make manual changes, please keep track in case you
+# need to recreate them later.
+#
+# See includes/DefaultSettings.php for all configurable settings
+# and their default values, but don't forget to make changes in _this_
+# file, not there.
+#
+# Further documentation for configuration settings may be found at:
+# http://www.mediawiki.org/wiki/Manual:Configuration_settings
+
+# Protect against web entry
+if ( !defined( 'MEDIAWIKI' ) ) {
+	exit;
+}
+
+## Uncomment this to disable output compression
+# $wgDisableOutputCompression = true;
+
+$wgSitename      = "Git-MediaWiki-Test";
+$wgMetaNamespace = "Git-MediaWiki-Test";
+
+## The URL base path to the directory containing the wiki;
+## defaults for all runtime URL paths are based off of this.
+## For more information on customizing the URLs please see:
+## http://www.mediawiki.org/wiki/Manual:Short_URL
+$wgScriptPath       = "@WG_SCRIPT_PATH@";
+$wgScriptExtension  = ".php";
+
+## The protocol and server name to use in fully-qualified URLs
+$wgServer           = "@WG_SERVER@";
+
+## The relative URL path to the skins directory
+$wgStylePath        = "$wgScriptPath/skins";
+
+## The relative URL path to the logo.  Make sure you change this from the default,
+## or else you'll overwrite your logo when you upgrade!
+$wgLogo             = "$wgStylePath/common/images/wiki.png";
+
+## UPO means: this is also a user preference option
+
+$wgEnableEmail      = true;
+$wgEnableUserEmail  = true; # UPO
+
+$wgEmergencyContact = "apache@localhost";
+$wgPasswordSender   = "apache@localhost";
+
+$wgEnotifUserTalk      = false; # UPO
+$wgEnotifWatchlist     = false; # UPO
+$wgEmailAuthentication = true;
+
+## Database settings
+$wgDBtype           = "sqlite";
+$wgDBserver         = "";
+$wgDBname           = "wikidb";
+$wgDBuser           = "";
+$wgDBpassword       = "";
+
+# SQLite-specific settings
+$wgSQLiteDataDir    = "@WG_SQLITE_DATADIR@";
+
+
+## Shared memory settings
+$wgMainCacheType    = CACHE_NONE;
+$wgMemCachedServers = array();
+
+## To enable image uploads, make sure the 'images' directory
+## is writable, then set this to true:
+$wgEnableUploads  = false;
+$wgUseImageMagick = true;
+$wgImageMagickConvertCommand ="@CONVERT@";
+
+# InstantCommons allows wiki to use images from http://commons.wikimedia.org
+$wgUseInstantCommons  = false;
+
+## If you use ImageMagick (or any other shell command) on a
+## Linux server, this will need to be set to the name of an
+## available UTF-8 locale
+$wgShellLocale = "en_US.utf8";
+
+## If you want to use image uploads under safe mode,
+## create the directories images/archive, images/thumb and
+## images/temp, and make them all writable. Then uncomment
+## this, if it's not already uncommented:
+#$wgHashedUploadDirectory = false;
+
+## Set $wgCacheDirectory to a writable directory on the web server
+## to make your wiki go slightly faster. The directory should not
+## be publically accessible from the web.
+#$wgCacheDirectory = "$IP/cache";
+
+# Site language code, should be one of the list in ./languages/Names.php
+$wgLanguageCode = "en";
+
+$wgSecretKey = "1c912bfe3519fb70f5dc523ecc698111cd43d81a11c585b3eefb28f29c2699b7";
+#$wgSecretKey = "@SECRETKEY@";
+
+
+# Site upgrade key. Must be set to a string (default provided) to turn on the
+# web installer while LocalSettings.php is in place
+$wgUpgradeKey = "ddae7dc87cd0a645";
+
+## Default skin: you can change the default skin. Use the internal symbolic
+## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector':
+$wgDefaultSkin = "vector";
+
+## For attaching licensing metadata to pages, and displaying an
+## appropriate copyright notice / icon. GNU Free Documentation
+## License and Creative Commons licenses are supported so far.
+$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
+$wgRightsUrl  = "";
+$wgRightsText = "";
+$wgRightsIcon = "";
+
+# Path to the GNU diff3 utility. Used for conflict resolution.
+$wgDiff3 = "/usr/bin/diff3";
+
+# Query string length limit for ResourceLoader. You should only set this if
+# your web server has a query string length limit (then set it to that limit),
+# or if you have suhosin.get.max_value_length set in php.ini (then set it to
+# that value)
+$wgResourceLoaderMaxQueryLength = -1;
+
+
+
+# End of automatically generated settings.
+# Add more configuration options below.
+
diff --git a/t/install-wiki/wikidb.sqlite b/t/install-wiki/wikidb.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..809047334bf15891de943b480171beb2558f7cb8
GIT binary patch
literal 210944
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

literal 0
HcmV?d00001

diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
new file mode 100755
index 0000000..2deead7
--- /dev/null
+++ b/t/test-gitmw-lib.sh
@@ -0,0 +1,147 @@
+#
+# CONFIGURATION VARIABLES
+# You might want to change those ones ...
+#
+WIKI_DIR_NAME="wiki"            # Name of the wiki's directory
+WIKI_DIR_INST="/var/www"        # Directory of the web server
+TMP="/tmp"                      # Temporary directory for downloads
+                                # Absolute address needed!
+SERVER_ADDR="localhost"         # Web server's address
+
+#
+# CONFIGURATION
+# You should not change those ones unless you know what you to
+#
+# Do not change the variables below
+MW_VERSION="mediawiki-1.19.0"
+DB_FILE="wikidb.sqlite"
+FILES_FOLDER="install-wiki"
+WIKI_ADMIN="WikiAdmin"
+WIKI_PASSW="AdminPass"
+
+fail () {
+	echo "$1"
+	exit 1
+}
+
+
+
+# Install a wiki in your web server directory.
+cmd_install () {
+
+	# Copy the generic LocalSettings.php in the web server's directory
+	# And modify parameters according to the ones set at the top
+	# of this script.
+	# Note that LocalSettings.php is never modified.
+	if [ ! -f "$FILES_FOLDER/LocalSettings.php" ] ; then
+		fail "Can't find $FILES_FOLDER/LocalSettings.php " \
+			"in the current folder.
+		Please run the script inside its folder."
+	fi
+	cp "$FILES_FOLDER/LocalSettings.php" \
+		"$FILES_FOLDER/LocalSettings-tmp.php" ||
+		fail "Unable to copy $FILES_FOLDER/LocalSettings.php " \
+		"to $FILES_FOLDER/LocalSettings-tmp.php"
+
+	# Parse and set the LocalSettings file of the user according to the
+	# CONFIGURATION VARIABLES section at the beginning of this script
+	file_swap="$FILES_FOLDER/LocalSettings-swap.php"
+	sed "s,@WG_SCRIPT_PATH@,/$WIKI_DIR_NAME," \
+		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
+	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
+	sed "s,@WG_SERVER@,http://$SERVER_ADDR," \
+		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
+	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
+	sed "s,@WG_SQLITE_DATADIR@,$TMP," \
+		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
+	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
+
+	mkdir -p "$WIKI_DIR_INST/$WIKI_DIR_NAME"
+	if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ; then
+		fail "Folder $WIKI_DIR_INST/$WIKI_DIR_NAME doesn't exist. Please create it
+		and launch the script again."
+	fi
+
+	mv "$FILES_FOLDER/LocalSettings-tmp.php" \
+		"$WIKI_DIR_INST/$WIKI_DIR_NAME/LocalSettings.php" ||
+		fail "Unable to move $FILES_FOLDER/LocalSettings-tmp.php" \
+		"in $WIKI_DIR_INST/$WIKI_DIR_NAME"
+	echo "File $FILES_FOLDER/LocalSettings.php is set in $WIKI_DIR_INST/$WIKI_DIR_NAME"
+
+	chmod ugo+w "$FILES_FOLDER/$DB_FILE"
+	reset_db_wiki "."
+
+	# Fetch MediaWiki's archive if not already present in the TMP directory
+	cd "$TMP"
+	if [ ! -f "$MW_VERSION.tar.gz" ] ; then
+		echo "Downloading $MW_VERSION sources ..."
+		wget http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0.tar.gz ||
+			fail "Unable to download" \
+			"http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0.tar.gz.
+		Please fix your connection and launch the script again."
+	fi
+	tar xfz "$MW_VERSION.tar.gz"
+	echo "$MW_VERSION.tar.gz downloaded in `pwd`. You can delete it later if you want."
+
+	# Copy the files of MediaWiki wiki in the web server's directory.
+	cd "$MW_VERSION"
+	cp -Rf * "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||
+		fail "Unable to copy WikiMedia's files from `pwd` to $WIKI_DIR_INST/$WIKI_DIR_NAME"
+
+	set_admin_wiki
+
+	echo "Your wiki has been installed. You can check it at http://$SERVER_ADDR/$WIKI_DIR_NAME"
+}
+
+# Copy the initial database of the wiki over the actual one.
+# Argument $1 is the relative path to the folder $FILES_FOLDER
+#
+# Warning: This function should be not called by user. This is a private
+# function used by cmd_install and cmd_delete
+reset_db_wiki () {
+
+	# Copy initial database of the wiki
+	if [ ! -f "$1/$FILES_FOLDER/$DB_FILE" ] ; then
+		fail "Can't find $1/$FILES_FOLDER/$DB_FILE in the current folder."
+	fi
+	cp --preserve=mode,ownership "$1/$FILES_FOLDER/$DB_FILE" "$TMP" ||
+		fail "Can't copy $1/$FILES_FOLDER/$DB_FILE in $TMP"
+	echo "File $FILES_FOLDER/$DB_FILE is set in $TMP"
+}
+
+# Set the admin WikiAdmin with password AdminPass in the database.
+#
+# Warning: This function should be not called by user. This is a private
+# function used by cmd_install and cmd_delete
+set_admin_wiki () {
+
+	#Add the admin
+	my_pwd="`pwd`"
+	cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/maintenance/"
+	php changePassword.php --user="$WIKI_ADMIN" --password="$WIKI_PASSW" ||
+		fail "Unable to add an admin with the script $WIKI_DIR_INST/$WIKI_DIR_NAME/maintenance/
+	changePassword.php. Check you have the perms to do it."
+	echo "Admin \"$WIKI_ADMIN\" has password \"$WIKI_PASSW\""
+	cd "$my_pwd"
+}
+
+# Reset the database of the wiki and the password of the admin
+#
+# Warning: This function must be called only in a subdirectory of t/ directory
+cmd_reset () {
+	reset_db_wiki ".."
+	set_admin_wiki
+}
+
+# Delete the wiki created in the web server's directory and all its content
+# saved in the database.
+cmd_delete () {
+	# Delete the wiki's directory.
+	rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" ||
+		fail "Wiki's directory $WIKI_DIR_INST/" \
+		"$WIKI_DIR_NAME could not be deleted"
+
+	# Delete the wiki's SQLite database
+	rm -f "$TMP/$DB_FILE" || fail "Database $TMP/$DB_FILE could not be deleted."
+}
+
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
old mode 100644
new mode 100755
diff --git a/t/test-lib.sh b/t/test-lib.sh
old mode 100644
new mode 100755
-- 
1.7.10.2.552.gaa3bb87

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH 2/3] Test environment of git-remote-mw
  2012-05-30 17:04 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
@ 2012-05-30 17:04   ` Simon Cathebras
  2012-05-31  7:17     ` Matthieu Moy
  2012-05-30 17:04   ` [PATCH 3/3] Tests file for git-remote-mediawiki Simon Cathebras
  2012-05-31  7:19   ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Matthieu Moy
  2 siblings, 1 reply; 22+ messages in thread
From: Simon Cathebras @ 2012-05-30 17:04 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Guillaume.Sasdy,
	Julien.Khayat, Simon.Perrat, Charles Roussel, Julien Khayat,
	Simon Perrat, Guillaume Sasdy

From: Charles Roussel <charles.roussel@ensimag.fr>

In order to test git-remote-mediawiki, we need a package of functions
to manage a MediaWiki: edit a page, remove a page, fetch a page,
fetch all pages on a given wiki.

We also need functions to compare the content of directories.

Signed-off-by: Simon Cathebras <simon.cathebras@ensimag.imag.fr>
Signed-off-by: Charles Roussel <charles.roussel@ensimag.imag.fr>
Signed-off-by: Julien Khayat <julien.khayat@ensimag.imag.fr>
Signed-off-by: Simon Perrat <simon.perrat@ensimag.imag.fr>
Signed-off-by: Guillaume Sasdy <guillaume.sasdy@gmail.com>
---
 t/test-gitmw-lib.sh | 125 ++++++++++++++++++++++++++++++++++++---
 t/test-gitmw.pl     | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 281 insertions(+), 8 deletions(-)
 create mode 100755 t/test-gitmw.pl

diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
index 2deead7..8698625 100755
--- a/t/test-gitmw-lib.sh
+++ b/t/test-gitmw-lib.sh
@@ -1,27 +1,136 @@
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+#     Matthieu Moy <matthieu.moy@imag.fr>
+# License: GPL v2 or later
+
 #
 # CONFIGURATION VARIABLES
-# You might want to change those ones ...
+# You might want to change these ones
 #
 WIKI_DIR_NAME="wiki"            # Name of the wiki's directory
 WIKI_DIR_INST="/var/www"        # Directory of the web server
 TMP="/tmp"                      # Temporary directory for downloads
-                                # Absolute address needed!
+                                # Absolute path required!
 SERVER_ADDR="localhost"         # Web server's address
 
-#
 # CONFIGURATION
-# You should not change those ones unless you know what you to
+# You should not change these ones unless you know what you do
 #
-# Do not change the variables below
 MW_VERSION="mediawiki-1.19.0"
 DB_FILE="wikidb.sqlite"
 FILES_FOLDER="install-wiki"
 WIKI_ADMIN="WikiAdmin"
 WIKI_PASSW="AdminPass"
 
-fail () {
-	echo "$1"
-	exit 1
+# wiki_getpage <page_name> <dest_path>
+#
+# Fetch a page <page_name> from the wiki and copy its content
+# into directory <dest_path>.
+wiki_getpage () {
+	../test-gitmw.pl "get_page" -p "$1" "$2"
+}
+
+# wiki_delete_page <page_name>
+#
+# Delete the page <page_name> on the wiki.
+wiki_delete_page () {
+	../test-gitmw.pl "delete_page" -p "$1"
+}
+
+# wiki_edit_page <page_name> <page_content> <page_append>
+#
+# Edit a page <wiki_page> on the wiki with content <wiki_content>
+# If <wiki_append> == true the content will be appended
+# If the page doesn't exist, it is created.
+wiki_editpage () {
+	../test-gitmw.pl "edit_page" -p "$1" "$2" "$3"
+}
+
+# git_content <dir_1> <dir_2>
+#
+# Compare the contents of directories <dir_1> and <dir_2> with diff
+# and exits with error 1 if they do not match. The program will
+# not look into .git in the process.
+git_content () {
+	result=$(diff -r -B -w --exclude=".git" "$1" "$2")
+
+	if echo $result | grep -q ">" ; then
+		echo "test failed: files $1 and $2 do not match"
+		exit 1
+	fi
+}
+
+# git_exist <rep_name> <file_name>
+#
+# Check the existence of <file_name> into the git repository
+# <rep_name> and exits with error 1 if it is absent.
+git_exist () {
+	result=$(find "$1" -type f -name "$2")
+
+	if ! echo $result | grep -q "$2" ; then
+		echo "test failed: file $2 does not exist in $1"
+		exit 1
+	fi
+}
+
+# wiki_page_content <file_name> <page_name> 
+#
+# Compares the contents of the file <file_name> and the wiki page
+# <page_name> and exits with error 1 if they do not match.
+wiki_page_content () {
+	wiki_getpage "$2" .
+
+	if test -f "$2".mw ; then
+	        git_content "$1" "$2".mw
+		rm "$2".mw
+	else
+		die "ERROR: file $2 not found on wiki"
+	fi
+}
+
+# wiki_page_exist <page_name>
+#
+# Check the existence of the page <page_name> on the wiki and exits
+# with error if it is absent from it.
+wiki_page_exist () {
+	wiki_getpage "$1" .
+
+	if test -f "$1".mw ; then
+		echo "test failed: file $1 not found on wiki"
+		exit 1
+	else 
+		rm "$1".mw
+	fi
+}
+
+# wiki_getallpagename
+# 
+# Fetch the name of each page on the wiki.
+wiki_getallpagename () {
+	../test-gitmw.pl "getallpagename" -p
+}
+
+# wiki_getallpage <dest_dir>
+#
+# Fetch all the pages from the wiki and place them in the directory
+# <dest_dir>.
+wiki_getallpage () {
+	wiki_getallpagename
+	mkdir $1
+	while read -r line; do
+		wiki_getpage "$line" $1;
+	done < all.txt
+	#rm all.txt
+}
+
+fail()
+{
+    echo $1
+    exit 1
 }
 
 
diff --git a/t/test-gitmw.pl b/t/test-gitmw.pl
new file mode 100755
index 0000000..e9c50f9
--- /dev/null
+++ b/t/test-gitmw.pl
@@ -0,0 +1,164 @@
+#!/usr/bin/perl -w
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+#     Matthieu Moy <matthieu.moy@imag.fr>
+# License: GPL v2 or later
+
+# Usage:
+#       ./test-gitmw.pl <function> [argument]*
+# Execute in terminal using the name of the function to call as first
+# parameter, and the function's arguments as following parameters
+#
+# Example:
+#     ./test-gitmw.pl "get_page" foo .
+# will call <wiki_getpage> with arguments <foo> and <.>
+#
+# Available functions are:
+#     "get_page"
+#     "delete_page"
+#     "edit_page"
+#     "getallpagename"
+
+use MediaWiki::API;
+use Switch;
+# URL of the wiki used for the tests
+my $wiki_url="http://localhost/wiki/api.php";
+my $wiki_admin='WikiAdmin';
+my $wiki_admin_pass='AdminPass';
+my $mw = MediaWiki::API->new;
+$mw->{config}->{api_url} = $wiki_url;
+
+# wiki_login <name> <password>
+#
+# Logs the user with <name> and <password> in the global variable
+# of the mediawiki $mw
+sub wiki_login {
+	$mw->login( { lgname => "$_[0]",lgpassword => "$_[1]" } )
+                || die "getpage: login failed";
+}
+
+# wiki_getpage <wiki_page> <dest_path>
+#
+# fetch a page <wiki_page> from the wiki referenced in the global variable
+# $mw and copies its content in directory dest_path
+sub wiki_getpage {
+	my $pagename = $_[0];
+	my $destdir = $_[1];
+	
+	my $page = $mw->get_page( { title => $pagename } );
+	if (!defined($page)) {
+		die "getpage: wiki does not exist";
+	}
+
+	my $content = $page->{'*'};
+	if (!defined($content)) {
+		die "getpage: page does not exist";
+	}
+
+        # Replace spaces by underscore in the page name
+	$pagename=~s/\ /_/;
+	open(my $file, ">$destdir/$pagename.mw");
+	print $file "$content";
+	close ($file);
+}
+
+# wiki_delete_page <page_name>
+#
+# delete the page with name <page_name> from the wiki referenced
+# in the global variable $mw
+sub wiki_delete_page {
+	my $pagename = $_[0];
+
+	my $exist=$mw->get_page({title => $pagename});
+
+	if (defined($exist->{'*'})){
+		$mw->edit({ action => 'delete',
+			        title => $pagename})
+		|| die $mw->{error}->{code} . ": " . $mw->{error}->{details};
+	}
+        else{
+		die "no page with such name found: $pagename\n";
+	}
+}
+
+# wiki_editpage <wiki_page> <wiki_content> <wiki_append>
+#
+# Edit a page named <wiki_page> with content <wiki_content> on the wiki
+# referenced with the global variable $mw
+# If <wiki_append> == true : append <wiki_content> at the end of the actual
+# content of the page <wiki_page>
+# If <wik_page> doesn't exist, that page is created with the <wiki_content>
+sub wiki_editpage {
+	my $wiki_page = $_[0];
+	my $wiki_content = $_[1];
+	my $wiki_append = $_[2];
+
+	my $append = 0;
+	if (defined($wiki_append) && $wiki_append eq 'true') {
+		$append=1;
+	}
+
+	my $previous_text ="";
+
+	if ($append) {
+	my $ref = $mw->get_page( { title => $wiki_page } );
+		$previous_text = $ref->{'*'};
+	}
+
+	my $text = $wiki_content;
+	if (defined($previous_text)) {
+		$text="$previous_text\n\n$text";
+	}
+	$mw->edit( { action => 'edit', title => $wiki_page, text => "$text"} );
+}
+
+# wiki_getallpagename
+#
+# Fetch all pages of the wiki referenced by the global variable $mw
+# and print the names of each one in the file all.txt with a new line
+# ("\n") between these.
+sub wiki_getallpagename {
+        # fetch the pages of the wiki
+	$mw->list ( { action => 'query',
+			list => 'allpages',
+			#cmtitle => "Category:Surnames",
+			#cmnamespace => 0,
+			cmlimit=> 500 },
+		{ max => 4, hook => \&cat_names } )
+	        || die $mw->{error}->{code}.": ".$mw->{error}->{details};
+
+	# print the name of each page
+	sub cat_names {
+		my ($ref) = @_;
+
+		open(my $file, ">all.txt");
+		foreach (@$ref) {
+			print $file "$_->{title}\n";
+		}
+		close ($file);
+	}
+}
+
+# Main part of this script: parse the command line arguments
+# and select which function to execute
+my $fct_to_call = shift;
+my $login = $ARGV[0];
+
+if ($login eq "-p")
+{
+	&wiki_login($wiki_admin,$wiki_admin_pass);
+	shift;
+}
+
+switch ($fct_to_call) {
+	case "get_page" { &wiki_getpage($ARGV[0], $ARGV[1])}
+	case "delete_page" { &wiki_delete_page($ARGV[0])}
+	case "edit_page" { &wiki_editpage($ARGV[0], $ARGV[1], $ARGV[2])}
+	case "getallpagename" { &wiki_getallpagename()}
+	else{ die("test-gitmw.pl ERROR: wrong argument")}
+}
+
-- 
1.7.10.2.552.gaa3bb87

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH 3/3] Tests file for git-remote-mediawiki
  2012-05-30 17:04 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
  2012-05-30 17:04   ` [PATCH 2/3] Test environment of git-remote-mw Simon Cathebras
@ 2012-05-30 17:04   ` Simon Cathebras
  2012-05-31  7:19   ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Matthieu Moy
  2 siblings, 0 replies; 22+ messages in thread
From: Simon Cathebras @ 2012-05-30 17:04 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Guillaume.Sasdy,
	Julien.Khayat, Simon.Perrat, Charles Roussel, Julien Khayat,
	Simon Perrat, Guillaume Sasdy

From: Charles Roussel <charles.roussel@ensimag.fr>

This file (will) contains all tests for git-remote-mediawiki.
For now, we have one test of git-clone on a wiki with one page.

Signed-off-by: Simon Cathebras <simon.cathebras@ensimag.imag.fr>
Signed-off-by: Charles Roussel <charles.roussel@ensimag.imag.fr>
Signed-off-by: Julien Khayat <julien.khayat@ensimag.imag.fr>
Signed-off-by: Simon Perrat <simon.perrat@ensimag.imag.fr>
Signed-off-by: Guillaume Sasdy <guillaume.sasdy@gmail.com>
---
 t/t9360-git-mediawiki.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100755 t/t9360-git-mediawiki.sh

diff --git a/t/t9360-git-mediawiki.sh b/t/t9360-git-mediawiki.sh
new file mode 100755
index 0000000..8de56c5
--- /dev/null
+++ b/t/t9360-git-mediawiki.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+#     Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
+#
+# License: GPL v2 or later
+
+# tests for git-remote-mediawiki
+
+test_description='Test the Git Mediawiki remote helper'
+
+. ./test-gitmw-lib.sh
+. ./test-lib.sh
+
+if ! test_have_prereq PERL
+then
+	skip_all='skipping gateway git-mw tests, perl not available'
+	test_done
+fi
+
+if [ ! -f /$GIT_BUILD_DIR/git-remote-mediawiki ];
+then
+	skip_all='skipping gateway git-mw tests, no remote mediawiki for git found'
+	test_done
+fi
+
+if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ;
+then
+	skip_all='skipping gateway git-mw tests, no mediawiki found'
+	test_done
+fi
+
+test_expect_success 'git clone works with page added' '
+	cmd_reset &&
+	wiki_editpage foo "hello_world" false &&
+	wiki_editpage bar "hi everybody !" false &&
+	git clone mediawiki::http://localhost/wiki mw_dir &&
+	wiki_getallpage ref_page &&
+	git_content mw_dir ref_page &&
+	wiki_delete_page foo &&
+	wiki_delete_page bar
+'
+
+test_done
-- 
1.7.10.2.552.gaa3bb87

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Test environment of git-remote-mw
  2012-05-30 17:04   ` [PATCH 2/3] Test environment of git-remote-mw Simon Cathebras
@ 2012-05-31  7:17     ` Matthieu Moy
  2012-06-01  8:53       ` Simon.Cathebras
  0 siblings, 1 reply; 22+ messages in thread
From: Matthieu Moy @ 2012-05-31  7:17 UTC (permalink / raw)
  To: Simon Cathebras
  Cc: git, charles.roussel, Guillaume.Sasdy, Julien.Khayat,
	Simon.Perrat, Charles Roussel, Guillaume Sasdy

Simon Cathebras <simon.cathebras@ensimag.imag.fr> writes:

> index 2deead7..8698625 100755
> --- a/t/test-gitmw-lib.sh
> +++ b/t/test-gitmw-lib.sh
> @@ -1,27 +1,136 @@
> +# Copyright (C) 2012
> +#     Charles Roussel <charles.roussel@ensimag.imag.fr>
> +#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
> +#     Julien Khayat <julien.khayat@ensimag.imag.fr>
> +#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
> +#     Simon Perrat <simon.perrat@ensimag.imag.fr>
> +#     Matthieu Moy <matthieu.moy@imag.fr>
> +# License: GPL v2 or later
> +

Why is this added by [PATCH 2/3]?

> -# You might want to change those ones ...
> +# You might want to change these ones
>  #
>  WIKI_DIR_NAME="wiki"            # Name of the wiki's directory
>  WIKI_DIR_INST="/var/www"        # Directory of the web server
>  TMP="/tmp"                      # Temporary directory for downloads
> -                                # Absolute address needed!
> +                                # Absolute path required!
>  SERVER_ADDR="localhost"         # Web server's address
>  
> -#
>  # CONFIGURATION
> -# You should not change those ones unless you know what you to
> +# You should not change these ones unless you know what you do

These fixups should have been squashed into the previous one. Bad use of
"git rebase -i"?

> +	../test-gitmw.pl "get_page" -p "$1" "$2"

Useless quotes around "get_page".

(but useful ones around $1 and $2 ;-))

> +	result=$(diff -r -B -w --exclude=".git" "$1" "$2")

Doesn't seem to be in POSIX:

http://pubs.opengroup.org/onlinepubs/009695399/utilities/diff.html

Will this run on all platforms?

> +# wiki_page_content <file_name> <page_name> 
> +#
> +# Compares the contents of the file <file_name> and the wiki page
> +# <page_name> and exits with error 1 if they do not match.

If it does a comparison, why isn't it named "check_content", or
"diff_content"?

> +# Usage:
> +#       ./test-gitmw.pl <function> [argument]*

I'd say s/function/command/

> +my $wiki_url="http://localhost/wiki/api.php";
> +my $wiki_admin='WikiAdmin';
> +my $wiki_admin_pass='AdminPass';

It would be nice to allow overriding these from the command-line. But as
you are now writting tests, you may as well apply the YAGNI
principle ;-).

> +        # Replace spaces by underscore in the page name

Indent with space.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 1/3] Script to install, delete and clear a MediaWiki
  2012-05-30 17:04 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
  2012-05-30 17:04   ` [PATCH 2/3] Test environment of git-remote-mw Simon Cathebras
  2012-05-30 17:04   ` [PATCH 3/3] Tests file for git-remote-mediawiki Simon Cathebras
@ 2012-05-31  7:19   ` Matthieu Moy
  2 siblings, 0 replies; 22+ messages in thread
From: Matthieu Moy @ 2012-05-31  7:19 UTC (permalink / raw)
  To: Simon Cathebras
  Cc: git, charles.roussel, Guillaume.Sasdy, Julien.Khayat,
	Simon.Perrat, Charles Roussel, Guillaume Sasdy

Simon Cathebras <simon.cathebras@ensimag.imag.fr> writes:

> install_wiki also defines a function cmd_reset

Why the "cmd_reset" name?

Wouldn't wiki_reset be both more descriptive and more consistent?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH 1/2] FIX: t9360. NEW test t9361 for git pull and git push
  2012-05-30 16:30 [PATCH/RFC]Test environment for Git-MediaWiki Simon.Cathebras
  2012-05-30 17:04 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
@ 2012-05-31 18:13 ` Guillaume Sasdy
  2012-05-31 18:13   ` [PATCH 2/2] FIX: Syntax of shell and perl scripts and posix compliant Guillaume Sasdy
  2012-05-31 18:16 ` [PATCH] " Guillaume Sasdy
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 22+ messages in thread
From: Guillaume Sasdy @ 2012-05-31 18:13 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Julien.Khayat,
	Simon.Perrat, Guillaume Sasdy

t9360: change the description of the test. Test git clone
t9361: Test git pull (add page, edit page, delete page) and git push on simple test cases (add file, edit file, delete file).
---
 t/t9360-git-mediawiki.sh |   4 +-
 t/t9361-git-mediawiki.sh | 156 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100755 t/t9361-git-mediawiki.sh

diff --git a/t/t9360-git-mediawiki.sh b/t/t9360-git-mediawiki.sh
index 8de56c5..57e05d8 100755
--- a/t/t9360-git-mediawiki.sh
+++ b/t/t9360-git-mediawiki.sh
@@ -12,7 +12,7 @@
 
 # tests for git-remote-mediawiki
 
-test_description='Test the Git Mediawiki remote helper'
+test_description='Test the Git Mediawiki remote helper: git clone'
 
 . ./test-gitmw-lib.sh
 . ./test-lib.sh
@@ -36,7 +36,7 @@ then
 fi
 
 test_expect_success 'git clone works with page added' '
-	cmd_reset &&
+	wiki_reset &&
 	wiki_editpage foo "hello_world" false &&
 	wiki_editpage bar "hi everybody !" false &&
 	git clone mediawiki::http://localhost/wiki mw_dir &&
diff --git a/t/t9361-git-mediawiki.sh b/t/t9361-git-mediawiki.sh
new file mode 100755
index 0000000..9dd7274
--- /dev/null
+++ b/t/t9361-git-mediawiki.sh
@@ -0,0 +1,156 @@
+#!/bin/sh
+#
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+#     Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
+#
+# License: GPL v2 or later
+
+# tests for git-remote-mediawiki
+
+test_description='Test the Git Mediawiki remote helper: git push and git pull simple test cases'
+
+. ./test-gitmw-lib.sh
+. ./test-lib.sh
+
+if ! test_have_prereq PERL
+then
+	skip_all='skipping gateway git-mw tests, perl not available'
+	test_done
+fi
+
+if [ ! -f /$GIT_BUILD_DIR/git-remote-mediawiki ];
+then
+	skip_all='skipping gateway git-mw tests, no remote mediawiki for git found'
+	test_done
+fi
+
+if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ;
+then
+	skip_all='skipping gateway git-mw tests, no mediawiki found'
+	test_done
+fi
+
+# Create a new file foo.mw in a freshly cloned wiki. Commit and push
+# this file and then check that all files of the repository are similar to
+# the wiki pages.
+test_expect_success 'git push works after adding a file .mw' "
+        wiki_reset &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+        wiki_getallpage ref_page &&
+
+        cd mw_dir &&
+        test ! -f foo.mw && # foo.mw should not exist after wiki_reset &&
+        touch foo.mw &&
+        echo \"hello world\" >> foo.mw &&
+        git add foo.mw &&
+        git commit -m \"foo\" &&
+        git push &&
+        cd .. &&
+
+        rm -rf ref_page &&
+        wiki_getallpage ref_page &&
+        git_content mw_dir ref_page &&
+        rm -rf ref_page &&
+        rm -rf mw_dir
+"
+
+# Create a new page Foo in an empty wiki. Clone the wiki and edit
+# the file foo.mw corresponding to the page Foo. Commit and push
+# then check that all files of the repository are similar to the wiki
+# pages.
+test_expect_success 'git push works after editing a file .mw' "
+        # clone an empty wiki and add a Foo page
+        wiki_reset &&
+        wiki_editpage \"foo\" \"page just created before the git clone\" false &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+
+        cd mw_dir &&
+        echo \"new line added in the file foo.mw\" >> Foo.mw &&
+        git commit -am \"edit file foo.mw\" &&
+        git push &&
+        cd .. &&
+
+        rm -rf ref_page &&
+        wiki_getallpage ref_page &&
+        git_content mw_dir ref_page &&
+        rm -rf ref_page &&
+        rm -rf mw_dir
+"
+
+# Clone a wiki with a page Foo. Remove the corresponding file from the
+# repository. Check that the wiki page has been actually removed.
+test_expect_failure 'git push works after deleting a file' "
+        wiki_reset &&
+        wiki_editpage foo \"wiki page added before git clone\" false &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+
+        cd mw_dir &&
+        git rm Foo.mw &&
+        git commit -am \"git rm delete the wiki page Foo.mw\" &&
+        git push &&
+        cd .. &&
+
+        rm -rf mw_dir &&
+        test ! wiki_page_exist Foo
+"
+
+# Clone an empty wiki. Add a page on the wiki and pull. Check 
+# all files of the repository are similar to the wiki pages.
+test_expect_success 'git pull works after adding a new wiki page' "
+        wiki_reset &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+        wiki_editpage foo \"page just created after the git clone\" false &&
+
+        cd mw_dir &&
+        git pull &&
+        cd .. &&
+
+        rm -rf ref_page &&
+        wiki_getallpage ref_page &&
+        git_content mw_dir ref_page &&
+        rm -rf ref_page &&
+        rm -rf mw_dir
+"
+
+# Clone a wiki with a page Foo. Edit the page foo on the wiki and pull.
+# Check that all files of the repository are similar to the wiki pages.
+test_expect_success 'git pull works after editing a wiki page' "
+        wiki_reset &&
+        wiki_editpage foo \"page just created before the git clone\" false &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+        wiki_editpage foo \"new line added on the wiki\" true &&
+
+        cd mw_dir &&
+        git pull &&
+        cd .. &&
+       
+        rm -rf ref_page &&
+        wiki_getallpage ref_page &&
+        git_content mw_dir ref_page &&
+        rm -rf ref_page
+        rm -rf mw_dir
+"
+
+# Clone a wiki with a page Foo. Remove the wiki page and pull.
+# Check that the corresponding file in the repository has been actually removed.
+test_expect_failure 'git pull works after deleting a wiki page' "
+        wiki_reset &&
+        wiki_editpage foo \"wiki page added before git clone\" false &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+
+        cd mw_dir &&
+        wiki_delete_page foo
+        git pull &&
+        test ! -f Foo.mw &&
+        cd .. &&
+
+        rm -rf mw_dir
+"
+
+test_done
+
-- 
1.7.10.2.568.g4c26a3a

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH 2/2] FIX: Syntax of shell and perl scripts and posix compliant
  2012-05-31 18:13 ` [PATCH 1/2] FIX: t9360. NEW test t9361 for git pull and git push Guillaume Sasdy
@ 2012-05-31 18:13   ` Guillaume Sasdy
  0 siblings, 0 replies; 22+ messages in thread
From: Guillaume Sasdy @ 2012-05-31 18:13 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Julien.Khayat,
	Simon.Perrat

From: Simon Cathebras <simon.cathebras@ensimag.imag.fr>

t/test-gitmw.pl: no more '\n' in the append of wiki_editpage
t/test-gitmw-lib.sh: grep is now Posix compliant
t/test-gitmw-lib.sh: some "  " were misplaced
---
 t/test-gitmw-lib.sh | 17 ++++++++---------
 t/test-gitmw.pl     |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
index b89b45a..d7c7459 100755
--- a/t/test-gitmw-lib.sh
+++ b/t/test-gitmw-lib.sh
@@ -31,14 +31,14 @@ WIKI_PASSW="AdminPass"
 # Fetch a page <page_name> from the wiki and copy its content
 # into directory <dest_path>.
 wiki_getpage () {
-	../test-gitmw.pl "get_page" -p "$1" "$2"
+	../test-gitmw.pl get_page -p "$1" "$2"
 }
 
 # wiki_delete_page <page_name>
 #
 # Delete the page <page_name> on the wiki.
 wiki_delete_page () {
-	../test-gitmw.pl "delete_page" -p "$1"
+	../test-gitmw.pl delete_page -p "$1"
 }
 
 # wiki_edit_page <page_name> <page_content> <page_append>
@@ -47,7 +47,7 @@ wiki_delete_page () {
 # If <wiki_append> == true the content will be appended
 # If the page doesn't exist, it is created.
 wiki_editpage () {
-	../test-gitmw.pl "edit_page" -p "$1" "$2" "$3"
+	../test-gitmw.pl edit_page -p "$1" "$2" "$3"
 }
 
 # git_content <dir_1> <dir_2>
@@ -56,7 +56,7 @@ wiki_editpage () {
 # and exits with error 1 if they do not match. The program will
 # not look into .git in the process.
 git_content () {
-	result=$(diff -r -B -w --exclude=".git" "$1" "$2")
+	result=$(diff -r -b --exclude=".git" "$1" "$2")
 
 	if echo $result | grep -q ">" ; then
 		echo "test failed: files $1 and $2 do not match"
@@ -77,11 +77,11 @@ git_exist () {
 	fi
 }
 
-# wiki_page_content <file_name> <page_name> 
+# wiki_check_content <file_name> <page_name> 
 #
 # Compares the contents of the file <file_name> and the wiki page
 # <page_name> and exits with error 1 if they do not match.
-wiki_page_content () {
+wiki_check_content () {
 	wiki_getpage "$2" .
 
 	if test -f "$2".mw ; then
@@ -120,16 +120,15 @@ wiki_getallpagename () {
 # <dest_dir>.
 wiki_getallpage () {
 	wiki_getallpagename
-	mkdir $1
+	mkdir -p "$1"
 	while read -r line; do
 		wiki_getpage "$line" $1;
 	done < all.txt
-	#rm all.txt
 }
 
 fail()
 {
-    echo $1
+    echo "$1"
     exit 1
 }
 
diff --git a/t/test-gitmw.pl b/t/test-gitmw.pl
index e9c50f9..bf71485 100755
--- a/t/test-gitmw.pl
+++ b/t/test-gitmw.pl
@@ -9,7 +9,7 @@
 # License: GPL v2 or later
 
 # Usage:
-#       ./test-gitmw.pl <function> [argument]*
+#       ./test-gitmw.pl <command> [argument]*
 # Execute in terminal using the name of the function to call as first
 # parameter, and the function's arguments as following parameters
 #
@@ -111,7 +111,7 @@ sub wiki_editpage {
 
 	my $text = $wiki_content;
 	if (defined($previous_text)) {
-		$text="$previous_text\n\n$text";
+		$text="$previous_text$text";
 	}
 	$mw->edit( { action => 'edit', title => $wiki_page, text => "$text"} );
 }
-- 
1.7.10.2.568.g4c26a3a

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH] FIX: Syntax of shell and perl scripts and posix compliant
  2012-05-30 16:30 [PATCH/RFC]Test environment for Git-MediaWiki Simon.Cathebras
  2012-05-30 17:04 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
  2012-05-31 18:13 ` [PATCH 1/2] FIX: t9360. NEW test t9361 for git pull and git push Guillaume Sasdy
@ 2012-05-31 18:16 ` Guillaume Sasdy
  2012-05-31 18:27 ` Guillaume Sasdy
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 22+ messages in thread
From: Guillaume Sasdy @ 2012-05-31 18:16 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Julien.Khayat,
	Simon.Perrat

From: Simon Cathebras <simon.cathebras@ensimag.imag.fr>

t/test-gitmw.pl: no more '\n' in the append of wiki_editpage
t/test-gitmw-lib.sh: grep is now Posix compliant
t/test-gitmw-lib.sh: some "  " were misplaced
---
 t/test-gitmw-lib.sh | 17 ++++++++---------
 t/test-gitmw.pl     |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
index b89b45a..d7c7459 100755
--- a/t/test-gitmw-lib.sh
+++ b/t/test-gitmw-lib.sh
@@ -31,14 +31,14 @@ WIKI_PASSW="AdminPass"
 # Fetch a page <page_name> from the wiki and copy its content
 # into directory <dest_path>.
 wiki_getpage () {
-	../test-gitmw.pl "get_page" -p "$1" "$2"
+	../test-gitmw.pl get_page -p "$1" "$2"
 }
 
 # wiki_delete_page <page_name>
 #
 # Delete the page <page_name> on the wiki.
 wiki_delete_page () {
-	../test-gitmw.pl "delete_page" -p "$1"
+	../test-gitmw.pl delete_page -p "$1"
 }
 
 # wiki_edit_page <page_name> <page_content> <page_append>
@@ -47,7 +47,7 @@ wiki_delete_page () {
 # If <wiki_append> == true the content will be appended
 # If the page doesn't exist, it is created.
 wiki_editpage () {
-	../test-gitmw.pl "edit_page" -p "$1" "$2" "$3"
+	../test-gitmw.pl edit_page -p "$1" "$2" "$3"
 }
 
 # git_content <dir_1> <dir_2>
@@ -56,7 +56,7 @@ wiki_editpage () {
 # and exits with error 1 if they do not match. The program will
 # not look into .git in the process.
 git_content () {
-	result=$(diff -r -B -w --exclude=".git" "$1" "$2")
+	result=$(diff -r -b --exclude=".git" "$1" "$2")
 
 	if echo $result | grep -q ">" ; then
 		echo "test failed: files $1 and $2 do not match"
@@ -77,11 +77,11 @@ git_exist () {
 	fi
 }
 
-# wiki_page_content <file_name> <page_name> 
+# wiki_check_content <file_name> <page_name> 
 #
 # Compares the contents of the file <file_name> and the wiki page
 # <page_name> and exits with error 1 if they do not match.
-wiki_page_content () {
+wiki_check_content () {
 	wiki_getpage "$2" .
 
 	if test -f "$2".mw ; then
@@ -120,16 +120,15 @@ wiki_getallpagename () {
 # <dest_dir>.
 wiki_getallpage () {
 	wiki_getallpagename
-	mkdir $1
+	mkdir -p "$1"
 	while read -r line; do
 		wiki_getpage "$line" $1;
 	done < all.txt
-	#rm all.txt
 }
 
 fail()
 {
-    echo $1
+    echo "$1"
     exit 1
 }
 
diff --git a/t/test-gitmw.pl b/t/test-gitmw.pl
index e9c50f9..bf71485 100755
--- a/t/test-gitmw.pl
+++ b/t/test-gitmw.pl
@@ -9,7 +9,7 @@
 # License: GPL v2 or later
 
 # Usage:
-#       ./test-gitmw.pl <function> [argument]*
+#       ./test-gitmw.pl <command> [argument]*
 # Execute in terminal using the name of the function to call as first
 # parameter, and the function's arguments as following parameters
 #
@@ -111,7 +111,7 @@ sub wiki_editpage {
 
 	my $text = $wiki_content;
 	if (defined($previous_text)) {
-		$text="$previous_text\n\n$text";
+		$text="$previous_text$text";
 	}
 	$mw->edit( { action => 'edit', title => $wiki_page, text => "$text"} );
 }
-- 
1.7.10.2.568.g4c26a3a

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH] FIX: Syntax of shell and perl scripts and posix compliant
  2012-05-30 16:30 [PATCH/RFC]Test environment for Git-MediaWiki Simon.Cathebras
                   ` (2 preceding siblings ...)
  2012-05-31 18:16 ` [PATCH] " Guillaume Sasdy
@ 2012-05-31 18:27 ` Guillaume Sasdy
  2012-05-31 18:31 ` [PATCH 1/3] FIX: cmd_* moved to wiki_* in test-gitmw-lib.sh and other files Guillaume Sasdy
  2012-06-01 10:41 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Guillaume Sasdy
  5 siblings, 0 replies; 22+ messages in thread
From: Guillaume Sasdy @ 2012-05-31 18:27 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Julien.Khayat,
	Simon.Perrat

From: Simon Cathebras <simon.cathebras@ensimag.imag.fr>

t/test-gitmw.pl: no more '\n' in the append of wiki_editpage
t/test-gitmw-lib.sh: grep is now Posix compliant
t/test-gitmw-lib.sh: some "  " were misplaced
---
 t/test-gitmw-lib.sh | 17 ++++++++---------
 t/test-gitmw.pl     |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
index b89b45a..d7c7459 100755
--- a/t/test-gitmw-lib.sh
+++ b/t/test-gitmw-lib.sh
@@ -31,14 +31,14 @@ WIKI_PASSW="AdminPass"
 # Fetch a page <page_name> from the wiki and copy its content
 # into directory <dest_path>.
 wiki_getpage () {
-	../test-gitmw.pl "get_page" -p "$1" "$2"
+	../test-gitmw.pl get_page -p "$1" "$2"
 }
 
 # wiki_delete_page <page_name>
 #
 # Delete the page <page_name> on the wiki.
 wiki_delete_page () {
-	../test-gitmw.pl "delete_page" -p "$1"
+	../test-gitmw.pl delete_page -p "$1"
 }
 
 # wiki_edit_page <page_name> <page_content> <page_append>
@@ -47,7 +47,7 @@ wiki_delete_page () {
 # If <wiki_append> == true the content will be appended
 # If the page doesn't exist, it is created.
 wiki_editpage () {
-	../test-gitmw.pl "edit_page" -p "$1" "$2" "$3"
+	../test-gitmw.pl edit_page -p "$1" "$2" "$3"
 }
 
 # git_content <dir_1> <dir_2>
@@ -56,7 +56,7 @@ wiki_editpage () {
 # and exits with error 1 if they do not match. The program will
 # not look into .git in the process.
 git_content () {
-	result=$(diff -r -B -w --exclude=".git" "$1" "$2")
+	result=$(diff -r -b --exclude=".git" "$1" "$2")
 
 	if echo $result | grep -q ">" ; then
 		echo "test failed: files $1 and $2 do not match"
@@ -77,11 +77,11 @@ git_exist () {
 	fi
 }
 
-# wiki_page_content <file_name> <page_name> 
+# wiki_check_content <file_name> <page_name> 
 #
 # Compares the contents of the file <file_name> and the wiki page
 # <page_name> and exits with error 1 if they do not match.
-wiki_page_content () {
+wiki_check_content () {
 	wiki_getpage "$2" .
 
 	if test -f "$2".mw ; then
@@ -120,16 +120,15 @@ wiki_getallpagename () {
 # <dest_dir>.
 wiki_getallpage () {
 	wiki_getallpagename
-	mkdir $1
+	mkdir -p "$1"
 	while read -r line; do
 		wiki_getpage "$line" $1;
 	done < all.txt
-	#rm all.txt
 }
 
 fail()
 {
-    echo $1
+    echo "$1"
     exit 1
 }
 
diff --git a/t/test-gitmw.pl b/t/test-gitmw.pl
index e9c50f9..bf71485 100755
--- a/t/test-gitmw.pl
+++ b/t/test-gitmw.pl
@@ -9,7 +9,7 @@
 # License: GPL v2 or later
 
 # Usage:
-#       ./test-gitmw.pl <function> [argument]*
+#       ./test-gitmw.pl <command> [argument]*
 # Execute in terminal using the name of the function to call as first
 # parameter, and the function's arguments as following parameters
 #
@@ -111,7 +111,7 @@ sub wiki_editpage {
 
 	my $text = $wiki_content;
 	if (defined($previous_text)) {
-		$text="$previous_text\n\n$text";
+		$text="$previous_text$text";
 	}
 	$mw->edit( { action => 'edit', title => $wiki_page, text => "$text"} );
 }
-- 
1.7.10.2.568.g4c26a3a

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH 1/3] FIX: cmd_* moved to wiki_* in test-gitmw-lib.sh and other files
  2012-05-30 16:30 [PATCH/RFC]Test environment for Git-MediaWiki Simon.Cathebras
                   ` (3 preceding siblings ...)
  2012-05-31 18:27 ` Guillaume Sasdy
@ 2012-05-31 18:31 ` Guillaume Sasdy
  2012-06-01 10:41 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Guillaume Sasdy
  5 siblings, 0 replies; 22+ messages in thread
From: Guillaume Sasdy @ 2012-05-31 18:31 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Julien.Khayat,
	Simon.Perrat

From: Simon Cathebras <simon.cathebras@ensimag.imag.fr>

Function cmd_* has been renamed in wiki_* in t/install-wiki.sh.
Change the calls in t/test-gitmw-lib.sh
---
 t/install-wiki.sh   |  4 ++--
 t/test-gitmw-lib.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/t/install-wiki.sh b/t/install-wiki.sh
index 725346e..322f46d 100755
--- a/t/install-wiki.sh
+++ b/t/install-wiki.sh
@@ -19,11 +19,11 @@ usage () {
 # Argument: install, delete, --help | -h
 case "$1" in
 	"install")
-		cmd_install
+		wiki_install
 		exit 0
 		;;
 	"delete")
-		cmd_delete
+		wiki_delete
 		exit 0
 		;;
 	"--help" | "-h")
diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
index 8698625..b89b45a 100755
--- a/t/test-gitmw-lib.sh
+++ b/t/test-gitmw-lib.sh
@@ -136,7 +136,7 @@ fail()
 
 
 # Install a wiki in your web server directory.
-cmd_install () {
+wiki_install () {
 
 	# Copy the generic LocalSettings.php in the web server's directory
 	# And modify parameters according to the ones set at the top
@@ -206,7 +206,7 @@ cmd_install () {
 # Argument $1 is the relative path to the folder $FILES_FOLDER
 #
 # Warning: This function should be not called by user. This is a private
-# function used by cmd_install and cmd_delete
+# function used by wiki_install and wiki_delete
 reset_db_wiki () {
 
 	# Copy initial database of the wiki
@@ -221,7 +221,7 @@ reset_db_wiki () {
 # Set the admin WikiAdmin with password AdminPass in the database.
 #
 # Warning: This function should be not called by user. This is a private
-# function used by cmd_install and cmd_delete
+# function used by wiki_install and wiki_delete
 set_admin_wiki () {
 
 	#Add the admin
@@ -237,14 +237,14 @@ set_admin_wiki () {
 # Reset the database of the wiki and the password of the admin
 #
 # Warning: This function must be called only in a subdirectory of t/ directory
-cmd_reset () {
+wiki_reset () {
 	reset_db_wiki ".."
 	set_admin_wiki
 }
 
 # Delete the wiki created in the web server's directory and all its content
 # saved in the database.
-cmd_delete () {
+wiki_delete () {
 	# Delete the wiki's directory.
 	rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" ||
 		fail "Wiki's directory $WIKI_DIR_INST/" \
-- 
1.7.10.2.568.g4c26a3a

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Test environment of git-remote-mw
  2012-05-31  7:17     ` Matthieu Moy
@ 2012-06-01  8:53       ` Simon.Cathebras
  2012-06-01  9:02         ` Matthieu Moy
  0 siblings, 1 reply; 22+ messages in thread
From: Simon.Cathebras @ 2012-06-01  8:53 UTC (permalink / raw)
  To: Matthieu Moy
  Cc: git, charles.roussel, Guillaume.Sasdy, Julien.Khayat,
	Simon.Perrat, Charles Roussel, Guillaume Sasdy

On 31/05/2012 09:17, Matthieu Moy wrote:
>
>> +	result=$(diff -r -B -w --exclude=".git" "$1" "$2")
> Doesn't seem to be in POSIX:
>
> http://pubs.opengroup.org/onlinepubs/009695399/utilities/diff.html
>
> Will this run on all platforms?
>
Indeed. According to the POSIX manual, the option -B and -w are merged 
in the single option -b.
In addition, -r option still exists (to compare recursively two 
directories).
The previous instruction will be write as follow :
     diff -r -b "$first_folder" "$second_folder"

With this fix, it will works on all platforms. ;)
>> +my $wiki_url="http://localhost/wiki/api.php";
>> +my $wiki_admin='WikiAdmin';
>> +my $wiki_admin_pass='AdminPass';
> It would be nice to allow overriding these from the command-line. But as
> you are now writting tests, you may as well apply the YAGNI
> principle ;-).
Does it seems important for you to overriding these from CL ?
By default, those settings work fine. You have to edit this only if you 
need a special configuration. But it is purely optionnal.

   Included in v2 patches:

     * Fixing errors pointed above.
     * Sqlite file excluded from the patches. Mainly with reviewing the 
wiki_install script.

On the other hand, considering the git-mediawiki is curently on contrib 
branch, shall we move our test environement from git/t to git/contrib/t ?

SimonC

-- 
CATHEBRAS Simon

2A-ENSIMAG

Filière Ingéniérie des Systèmes d'Information
Membre Bug-Buster

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Test environment of git-remote-mw
  2012-06-01  8:53       ` Simon.Cathebras
@ 2012-06-01  9:02         ` Matthieu Moy
  2012-06-01  9:21           ` Matthieu Moy
  0 siblings, 1 reply; 22+ messages in thread
From: Matthieu Moy @ 2012-06-01  9:02 UTC (permalink / raw)
  To: Simon.Cathebras
  Cc: git, charles.roussel, Guillaume.Sasdy, Julien.Khayat,
	Simon.Perrat, Charles Roussel, Guillaume Sasdy

"Simon.Cathebras" <Simon.Cathebras@ensimag.imag.fr> writes:

> On the other hand, considering the git-mediawiki is curently on
> contrib branch, shall we move our test environement from git/t to
> git/contrib/t ?

If so, that would be to $git/contrib/mw-to-git/t/.

I'm not sur what's best, depending on the future of the tool:

If, once Git-MediaWiki is robust, well-tested, ... and enough people are
interested, it may make sense to move Git-MediaWiki out of the contrib/
directory, and integrate it as an official command (like git-svn for
example). That would make the installation process seamless ("make
install" would install git-remote-mediawiki like other commands, "make
doc" would generate the doc, and so on), which would be nice for the
user.

My feeling is that we're still quite far from this. Although we're in
the process of having a well-tested program, and that new features are
going to come soon, there is still little interest of the community for
it (at least, uncomparable to the one of git-svn for example).

So, I'd say that we should stick to something non-intrusive, within
contrib/, and if more people show interest in the tool and if it becomes
mature enough, we can start trying to push it out of contrib/.

What do other people think?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Test environment of git-remote-mw
  2012-06-01  9:02         ` Matthieu Moy
@ 2012-06-01  9:21           ` Matthieu Moy
  0 siblings, 0 replies; 22+ messages in thread
From: Matthieu Moy @ 2012-06-01  9:21 UTC (permalink / raw)
  To: Simon.Cathebras
  Cc: git, charles.roussel, Guillaume.Sasdy, Julien.Khayat,
	Simon.Perrat, Charles Roussel, Guillaume Sasdy

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> "Simon.Cathebras" <Simon.Cathebras@ensimag.imag.fr> writes:
>
>> On the other hand, considering the git-mediawiki is curently on
>> contrib branch, shall we move our test environement from git/t to
>> git/contrib/t ?
>
> If so, that would be to $git/contrib/mw-to-git/t/.
>
> I'm not sur what's best, depending on the future of the tool:
>
> If, once Git-MediaWiki is robust, well-tested, ... and enough people are
> interested, it may make sense to move Git-MediaWiki out of the contrib/
> directory, and integrate it as an official command (like git-svn for
> example). That would make the installation process seamless ("make
> install" would install git-remote-mediawiki like other commands, "make
> doc" would generate the doc, and so on), which would be nice for the
> user.

Here's another attempt to be nice to the user, without getting out of
the contrib/ directory. I suggest that you include it in your patch
serie, and build your stuff on top of it.

--------------- 8< ----------------- 8< ------------------------
From 25187a652abc0b546be2fb1afb707b32b9f1d4fc Mon Sep 17 00:00:00 2001
From: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Fri, 1 Jun 2012 11:18:20 +0200
Subject: [PATCH] git-remote-mediawiki: simple Makefile for simple
 installation

This allows the user to run "make check" to install the script in Git's
exec path, following the configuration (manual in config.mak, or through
autoconf).
---
 contrib/mw-to-git/Makefile | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 contrib/mw-to-git/Makefile

diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
new file mode 100644
index 0000000..99b7caa
--- /dev/null
+++ b/contrib/mw-to-git/Makefile
@@ -0,0 +1,29 @@
+-include ../../config.mak
+-include ../../config.mak.autogen
+
+ifndef PERL_PATH
+	PERL_PATH = /usr/bin/perl
+endif
+
+PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
+gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
+
+SCRIPT=git-remote-mediawiki
+
+.PHONY: install help doc test
+help:
+	@echo 'This is the help target of the Makefile. Current configuration:'
+	@echo '  gitexecdir = $(gitexecdir_SQ)'
+	@echo '  PERL_PATH = $(PERL_PATH_SQ)'
+	@echo 'Run "$(MAKE) install" to install $(SCRIPT) in gitexecdir.'
+
+install:
+	sed -e '1s|#!.*/perl|#!$(PERL_PATH_SQ)|' $(SCRIPT) \
+            > '$(gitexecdir_SQ)/$(SCRIPT)'
+	chmod 755 '$(gitexecdir)/$(SCRIPT)'
+
+doc:
+	@echo 'Sorry, "make doc" is not implemented yet for $(SCRIPT)'
+
+test:
+	@echo 'Sorry, "make test" is not implemented yet for $(SCRIPT)'
-- 
1.7.10.2.817.g37218b0



-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH 1/3] Script to install, delete and clear a MediaWiki
  2012-05-30 16:30 [PATCH/RFC]Test environment for Git-MediaWiki Simon.Cathebras
                   ` (4 preceding siblings ...)
  2012-05-31 18:31 ` [PATCH 1/3] FIX: cmd_* moved to wiki_* in test-gitmw-lib.sh and other files Guillaume Sasdy
@ 2012-06-01 10:41 ` Guillaume Sasdy
  2012-06-01 10:41   ` [PATCH 2/3] Test environment of git-remote-mw Guillaume Sasdy
  2012-06-01 10:41   ` [PATCH 3/3] Tests file for git-remote-mediawiki Guillaume Sasdy
  5 siblings, 2 replies; 22+ messages in thread
From: Guillaume Sasdy @ 2012-06-01 10:41 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, Charles Roussel, Guillaume Sasdy, Simon Cathebras,
	Simon Perrat, Charles Roussel, Julien Khayat

From: Charles Roussel <charles.roussel@ensimag.fr>

install_wiki.sh expects the first argument to be 'install' or 'delete'
'install' installs a MediaWiki on the web's server with SQLite3
'delete' deletes the previously created wiki.
Note those functionnalities are made to be used from the user command line in
the directory t/

install_wiki also defines a function cmd_reset which clear all content
of the previously created wiki. Note this functionnality is made to be
used only by our test function in a subdirectory of t/

Signed-off-by: Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
Signed-off-by: Simon Cathebras <Simon.Cathebras@ensimag.imag.fr>
Signed-off-by: Simon Perrat <Simon.Perrat@ensimag.imag.fr>
Signed-off-by: Charles Roussel <Charles.Roussel@ensimag.imag.fr>
Signed-off-by: Julien Khayat <Julien.Khayat@ensimag.imag.fr>
---
 t/install-wiki.sh                |  38 ++++++++++
 t/install-wiki/LocalSettings.php | 129 ++++++++++++++++++++++++++++++++++
 t/install-wiki/wikidb.sqlite     | Bin 0 -> 210944 bytes
 t/test-gitmw-lib.sh              | 147 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 314 insertions(+)
 create mode 100755 t/install-wiki.sh
 create mode 100644 t/install-wiki/LocalSettings.php
 create mode 100644 t/install-wiki/wikidb.sqlite
 create mode 100755 t/test-gitmw-lib.sh
 mode change 100644 => 100755 t/test-lib-functions.sh
 mode change 100644 => 100755 t/test-lib.sh

diff --git a/t/install-wiki.sh b/t/install-wiki.sh
new file mode 100755
index 0000000..322f46d
--- /dev/null
+++ b/t/install-wiki.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# This script installs or deletes a MediaWiki on your computer.
+# It requires a web server with PHP and SQLite running. In addition, if you 
+# do not have MediaWiki sources on your computer, the option 'install' 
+# downloads them for you.
+# Please set the CONFIGURATION VARIABLES in ./test-gitmw-lib.sh
+
+. ./test-gitmw-lib.sh
+
+usage () {
+        echo "Usage: "
+        echo "  ./install-wiki.sh <install|delete|--help|-h>"
+        echo "          install: Install a wiki on your computer."
+        echo "          delete: Delete the wiki and all its pages and      content"
+}
+
+
+# Argument: install, delete, --help | -h
+case "$1" in
+	"install")
+		wiki_install
+		exit 0
+		;;
+	"delete")
+		wiki_delete
+		exit 0
+		;;
+	"--help" | "-h")
+		usage
+		exit 0
+		;;
+	*)
+		usage
+		exit 0
+		;;
+esac
+
diff --git a/t/install-wiki/LocalSettings.php b/t/install-wiki/LocalSettings.php
new file mode 100644
index 0000000..c2fe3d5
--- /dev/null
+++ b/t/install-wiki/LocalSettings.php
@@ -0,0 +1,129 @@
+<?php
+# This file was automatically generated by the MediaWiki 1.19.0
+# installer. If you make manual changes, please keep track in case you
+# need to recreate them later.
+#
+# See includes/DefaultSettings.php for all configurable settings
+# and their default values, but don't forget to make changes in _this_
+# file, not there.
+#
+# Further documentation for configuration settings may be found at:
+# http://www.mediawiki.org/wiki/Manual:Configuration_settings
+
+# Protect against web entry
+if ( !defined( 'MEDIAWIKI' ) ) {
+	exit;
+}
+
+## Uncomment this to disable output compression
+# $wgDisableOutputCompression = true;
+
+$wgSitename      = "Git-MediaWiki-Test";
+$wgMetaNamespace = "Git-MediaWiki-Test";
+
+## The URL base path to the directory containing the wiki;
+## defaults for all runtime URL paths are based off of this.
+## For more information on customizing the URLs please see:
+## http://www.mediawiki.org/wiki/Manual:Short_URL
+$wgScriptPath       = "@WG_SCRIPT_PATH@";
+$wgScriptExtension  = ".php";
+
+## The protocol and server name to use in fully-qualified URLs
+$wgServer           = "@WG_SERVER@";
+
+## The relative URL path to the skins directory
+$wgStylePath        = "$wgScriptPath/skins";
+
+## The relative URL path to the logo.  Make sure you change this from the default,
+## or else you'll overwrite your logo when you upgrade!
+$wgLogo             = "$wgStylePath/common/images/wiki.png";
+
+## UPO means: this is also a user preference option
+
+$wgEnableEmail      = true;
+$wgEnableUserEmail  = true; # UPO
+
+$wgEmergencyContact = "apache@localhost";
+$wgPasswordSender   = "apache@localhost";
+
+$wgEnotifUserTalk      = false; # UPO
+$wgEnotifWatchlist     = false; # UPO
+$wgEmailAuthentication = true;
+
+## Database settings
+$wgDBtype           = "sqlite";
+$wgDBserver         = "";
+$wgDBname           = "wikidb";
+$wgDBuser           = "";
+$wgDBpassword       = "";
+
+# SQLite-specific settings
+$wgSQLiteDataDir    = "@WG_SQLITE_DATADIR@";
+
+
+## Shared memory settings
+$wgMainCacheType    = CACHE_NONE;
+$wgMemCachedServers = array();
+
+## To enable image uploads, make sure the 'images' directory
+## is writable, then set this to true:
+$wgEnableUploads  = false;
+$wgUseImageMagick = true;
+$wgImageMagickConvertCommand ="@CONVERT@";
+
+# InstantCommons allows wiki to use images from http://commons.wikimedia.org
+$wgUseInstantCommons  = false;
+
+## If you use ImageMagick (or any other shell command) on a
+## Linux server, this will need to be set to the name of an
+## available UTF-8 locale
+$wgShellLocale = "en_US.utf8";
+
+## If you want to use image uploads under safe mode,
+## create the directories images/archive, images/thumb and
+## images/temp, and make them all writable. Then uncomment
+## this, if it's not already uncommented:
+#$wgHashedUploadDirectory = false;
+
+## Set $wgCacheDirectory to a writable directory on the web server
+## to make your wiki go slightly faster. The directory should not
+## be publically accessible from the web.
+#$wgCacheDirectory = "$IP/cache";
+
+# Site language code, should be one of the list in ./languages/Names.php
+$wgLanguageCode = "en";
+
+$wgSecretKey = "1c912bfe3519fb70f5dc523ecc698111cd43d81a11c585b3eefb28f29c2699b7";
+#$wgSecretKey = "@SECRETKEY@";
+
+
+# Site upgrade key. Must be set to a string (default provided) to turn on the
+# web installer while LocalSettings.php is in place
+$wgUpgradeKey = "ddae7dc87cd0a645";
+
+## Default skin: you can change the default skin. Use the internal symbolic
+## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector':
+$wgDefaultSkin = "vector";
+
+## For attaching licensing metadata to pages, and displaying an
+## appropriate copyright notice / icon. GNU Free Documentation
+## License and Creative Commons licenses are supported so far.
+$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
+$wgRightsUrl  = "";
+$wgRightsText = "";
+$wgRightsIcon = "";
+
+# Path to the GNU diff3 utility. Used for conflict resolution.
+$wgDiff3 = "/usr/bin/diff3";
+
+# Query string length limit for ResourceLoader. You should only set this if
+# your web server has a query string length limit (then set it to that limit),
+# or if you have suhosin.get.max_value_length set in php.ini (then set it to
+# that value)
+$wgResourceLoaderMaxQueryLength = -1;
+
+
+
+# End of automatically generated settings.
+# Add more configuration options below.
+
diff --git a/t/install-wiki/wikidb.sqlite b/t/install-wiki/wikidb.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..809047334bf15891de943b480171beb2558f7cb8
GIT binary patch
literal 210944
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

literal 0
HcmV?d00001

diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
new file mode 100755
index 0000000..b1023d7
--- /dev/null
+++ b/t/test-gitmw-lib.sh
@@ -0,0 +1,147 @@
+#
+# CONFIGURATION VARIABLES
+# You might want to change those ones ...
+#
+WIKI_DIR_NAME="wiki"            # Name of the wiki's directory
+WIKI_DIR_INST="/var/www"        # Directory of the web server
+TMP="/tmp"                      # Temporary directory for downloads
+                                # Absolute address needed!
+SERVER_ADDR="localhost"         # Web server's address
+
+#
+# CONFIGURATION
+# You should not change those ones unless you know what you to
+#
+# Do not change the variables below
+MW_VERSION="mediawiki-1.19.0"
+DB_FILE="wikidb.sqlite"
+FILES_FOLDER="install-wiki"
+WIKI_ADMIN="WikiAdmin"
+WIKI_PASSW="AdminPass"
+
+fail () {
+	echo "$1"
+	exit 1
+}
+
+
+
+# Install a wiki in your web server directory.
+wiki_install () {
+
+	# Copy the generic LocalSettings.php in the web server's directory
+	# And modify parameters according to the ones set at the top
+	# of this script.
+	# Note that LocalSettings.php is never modified.
+	if [ ! -f "$FILES_FOLDER/LocalSettings.php" ] ; then
+		fail "Can't find $FILES_FOLDER/LocalSettings.php " \
+			"in the current folder.
+		Please run the script inside its folder."
+	fi
+	cp "$FILES_FOLDER/LocalSettings.php" \
+		"$FILES_FOLDER/LocalSettings-tmp.php" ||
+		fail "Unable to copy $FILES_FOLDER/LocalSettings.php " \
+		"to $FILES_FOLDER/LocalSettings-tmp.php"
+
+	# Parse and set the LocalSettings file of the user according to the
+	# CONFIGURATION VARIABLES section at the beginning of this script
+	file_swap="$FILES_FOLDER/LocalSettings-swap.php"
+	sed "s,@WG_SCRIPT_PATH@,/$WIKI_DIR_NAME," \
+		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
+	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
+	sed "s,@WG_SERVER@,http://$SERVER_ADDR," \
+		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
+	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
+	sed "s,@WG_SQLITE_DATADIR@,$TMP," \
+		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
+	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
+
+	mkdir -p "$WIKI_DIR_INST/$WIKI_DIR_NAME"
+	if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ; then
+		fail "Folder $WIKI_DIR_INST/$WIKI_DIR_NAME doesn't exist. Please create it
+		and launch the script again."
+	fi
+
+	mv "$FILES_FOLDER/LocalSettings-tmp.php" \
+		"$WIKI_DIR_INST/$WIKI_DIR_NAME/LocalSettings.php" ||
+		fail "Unable to move $FILES_FOLDER/LocalSettings-tmp.php" \
+		"in $WIKI_DIR_INST/$WIKI_DIR_NAME"
+	echo "File $FILES_FOLDER/LocalSettings.php is set in $WIKI_DIR_INST/$WIKI_DIR_NAME"
+
+	chmod ugo+w "$FILES_FOLDER/$DB_FILE"
+	reset_db_wiki "."
+
+	# Fetch MediaWiki's archive if not already present in the TMP directory
+	cd "$TMP"
+	if [ ! -f "$MW_VERSION.tar.gz" ] ; then
+		echo "Downloading $MW_VERSION sources ..."
+		wget http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0.tar.gz ||
+			fail "Unable to download" \
+			"http://download.wikimedia.org/mediawiki/1.19/mediawiki-1.19.0.tar.gz.
+		Please fix your connection and launch the script again."
+	fi
+	tar xfz "$MW_VERSION.tar.gz"
+	echo "$MW_VERSION.tar.gz downloaded in `pwd`. You can delete it later if you want."
+
+	# Copy the files of MediaWiki wiki in the web server's directory.
+	cd "$MW_VERSION"
+	cp -Rf * "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||
+		fail "Unable to copy WikiMedia's files from `pwd` to $WIKI_DIR_INST/$WIKI_DIR_NAME"
+
+	set_admin_wiki
+
+	echo "Your wiki has been installed. You can check it at http://$SERVER_ADDR/$WIKI_DIR_NAME"
+}
+
+# Copy the initial database of the wiki over the actual one.
+# Argument $1 is the relative path to the folder $FILES_FOLDER
+#
+# Warning: This function should be not called by user. This is a private
+# function used by wiki_install and wiki_delete
+reset_db_wiki () {
+
+	# Copy initial database of the wiki
+	if [ ! -f "$1/$FILES_FOLDER/$DB_FILE" ] ; then
+		fail "Can't find $1/$FILES_FOLDER/$DB_FILE in the current folder."
+	fi
+	cp --preserve=mode,ownership "$1/$FILES_FOLDER/$DB_FILE" "$TMP" ||
+		fail "Can't copy $1/$FILES_FOLDER/$DB_FILE in $TMP"
+	echo "File $FILES_FOLDER/$DB_FILE is set in $TMP"
+}
+
+# Set the admin WikiAdmin with password AdminPass in the database.
+#
+# Warning: This function should be not called by user. This is a private
+# function used by wiki_install and wiki_delete
+set_admin_wiki () {
+
+	#Add the admin
+	my_pwd="`pwd`"
+	cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/maintenance/"
+	php changePassword.php --user="$WIKI_ADMIN" --password="$WIKI_PASSW" ||
+		fail "Unable to add an admin with the script $WIKI_DIR_INST/$WIKI_DIR_NAME/maintenance/
+	changePassword.php. Check you have the perms to do it."
+	echo "Admin \"$WIKI_ADMIN\" has password \"$WIKI_PASSW\""
+	cd "$my_pwd"
+}
+
+# Reset the database of the wiki and the password of the admin
+#
+# Warning: This function must be called only in a subdirectory of t/ directory
+wiki_reset () {
+	reset_db_wiki ".."
+	set_admin_wiki
+}
+
+# Delete the wiki created in the web server's directory and all its content
+# saved in the database.
+wiki_delete () {
+	# Delete the wiki's directory.
+	rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" ||
+		fail "Wiki's directory $WIKI_DIR_INST/" \
+		"$WIKI_DIR_NAME could not be deleted"
+
+	# Delete the wiki's SQLite database
+	rm -f "$TMP/$DB_FILE" || fail "Database $TMP/$DB_FILE could not be deleted."
+}
+
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
old mode 100644
new mode 100755
diff --git a/t/test-lib.sh b/t/test-lib.sh
old mode 100644
new mode 100755
-- 
1.7.10.2.568.g4c26a3a

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH 2/3] Test environment of git-remote-mw
  2012-06-01 10:41 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Guillaume Sasdy
@ 2012-06-01 10:41   ` Guillaume Sasdy
  2012-06-01 11:49     ` Matthieu Moy
  2012-06-01 10:41   ` [PATCH 3/3] Tests file for git-remote-mediawiki Guillaume Sasdy
  1 sibling, 1 reply; 22+ messages in thread
From: Guillaume Sasdy @ 2012-06-01 10:41 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, Charles Roussel, Guillaume Sasdy, Simon Cathebras,
	Simon Perrat, Charles Roussel, Julien Khayat

From: Charles Roussel <charles.roussel@ensimag.fr>

In order to test git-remote-mediawiki, we need a package of functions
to manage a MediaWiki: edit a page, remove a page, fetch a page,
fetch all pages on a given wiki.

We also need functions to compare the content of directories.

Signed-off-by: Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
Signed-off-by: Simon Cathebras <Simon.Cathebras@ensimag.imag.fr>
Signed-off-by: Simon Perrat <Simon.Perrat@ensimag.imag.fr>
Signed-off-by: Charles Roussel <Charles.Roussel@ensimag.imag.fr>
Signed-off-by: Julien Khayat <Julien.Khayat@ensimag.imag.fr>
---
 t/test-gitmw-lib.sh | 124 ++++++++++++++++++++++++++++++++++++---
 t/test-gitmw.pl     | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 280 insertions(+), 8 deletions(-)
 create mode 100755 t/test-gitmw.pl

diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
index b1023d7..d7c7459 100755
--- a/t/test-gitmw-lib.sh
+++ b/t/test-gitmw-lib.sh
@@ -1,27 +1,135 @@
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+#     Matthieu Moy <matthieu.moy@imag.fr>
+# License: GPL v2 or later
+
 #
 # CONFIGURATION VARIABLES
-# You might want to change those ones ...
+# You might want to change these ones
 #
 WIKI_DIR_NAME="wiki"            # Name of the wiki's directory
 WIKI_DIR_INST="/var/www"        # Directory of the web server
 TMP="/tmp"                      # Temporary directory for downloads
-                                # Absolute address needed!
+                                # Absolute path required!
 SERVER_ADDR="localhost"         # Web server's address
 
-#
 # CONFIGURATION
-# You should not change those ones unless you know what you to
+# You should not change these ones unless you know what you do
 #
-# Do not change the variables below
 MW_VERSION="mediawiki-1.19.0"
 DB_FILE="wikidb.sqlite"
 FILES_FOLDER="install-wiki"
 WIKI_ADMIN="WikiAdmin"
 WIKI_PASSW="AdminPass"
 
-fail () {
-	echo "$1"
-	exit 1
+# wiki_getpage <page_name> <dest_path>
+#
+# Fetch a page <page_name> from the wiki and copy its content
+# into directory <dest_path>.
+wiki_getpage () {
+	../test-gitmw.pl get_page -p "$1" "$2"
+}
+
+# wiki_delete_page <page_name>
+#
+# Delete the page <page_name> on the wiki.
+wiki_delete_page () {
+	../test-gitmw.pl delete_page -p "$1"
+}
+
+# wiki_edit_page <page_name> <page_content> <page_append>
+#
+# Edit a page <wiki_page> on the wiki with content <wiki_content>
+# If <wiki_append> == true the content will be appended
+# If the page doesn't exist, it is created.
+wiki_editpage () {
+	../test-gitmw.pl edit_page -p "$1" "$2" "$3"
+}
+
+# git_content <dir_1> <dir_2>
+#
+# Compare the contents of directories <dir_1> and <dir_2> with diff
+# and exits with error 1 if they do not match. The program will
+# not look into .git in the process.
+git_content () {
+	result=$(diff -r -b --exclude=".git" "$1" "$2")
+
+	if echo $result | grep -q ">" ; then
+		echo "test failed: files $1 and $2 do not match"
+		exit 1
+	fi
+}
+
+# git_exist <rep_name> <file_name>
+#
+# Check the existence of <file_name> into the git repository
+# <rep_name> and exits with error 1 if it is absent.
+git_exist () {
+	result=$(find "$1" -type f -name "$2")
+
+	if ! echo $result | grep -q "$2" ; then
+		echo "test failed: file $2 does not exist in $1"
+		exit 1
+	fi
+}
+
+# wiki_check_content <file_name> <page_name> 
+#
+# Compares the contents of the file <file_name> and the wiki page
+# <page_name> and exits with error 1 if they do not match.
+wiki_check_content () {
+	wiki_getpage "$2" .
+
+	if test -f "$2".mw ; then
+	        git_content "$1" "$2".mw
+		rm "$2".mw
+	else
+		die "ERROR: file $2 not found on wiki"
+	fi
+}
+
+# wiki_page_exist <page_name>
+#
+# Check the existence of the page <page_name> on the wiki and exits
+# with error if it is absent from it.
+wiki_page_exist () {
+	wiki_getpage "$1" .
+
+	if test -f "$1".mw ; then
+		echo "test failed: file $1 not found on wiki"
+		exit 1
+	else 
+		rm "$1".mw
+	fi
+}
+
+# wiki_getallpagename
+# 
+# Fetch the name of each page on the wiki.
+wiki_getallpagename () {
+	../test-gitmw.pl "getallpagename" -p
+}
+
+# wiki_getallpage <dest_dir>
+#
+# Fetch all the pages from the wiki and place them in the directory
+# <dest_dir>.
+wiki_getallpage () {
+	wiki_getallpagename
+	mkdir -p "$1"
+	while read -r line; do
+		wiki_getpage "$line" $1;
+	done < all.txt
+}
+
+fail()
+{
+    echo "$1"
+    exit 1
 }
 
 
diff --git a/t/test-gitmw.pl b/t/test-gitmw.pl
new file mode 100755
index 0000000..bf71485
--- /dev/null
+++ b/t/test-gitmw.pl
@@ -0,0 +1,164 @@
+#!/usr/bin/perl -w
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+#     Matthieu Moy <matthieu.moy@imag.fr>
+# License: GPL v2 or later
+
+# Usage:
+#       ./test-gitmw.pl <command> [argument]*
+# Execute in terminal using the name of the function to call as first
+# parameter, and the function's arguments as following parameters
+#
+# Example:
+#     ./test-gitmw.pl "get_page" foo .
+# will call <wiki_getpage> with arguments <foo> and <.>
+#
+# Available functions are:
+#     "get_page"
+#     "delete_page"
+#     "edit_page"
+#     "getallpagename"
+
+use MediaWiki::API;
+use Switch;
+# URL of the wiki used for the tests
+my $wiki_url="http://localhost/wiki/api.php";
+my $wiki_admin='WikiAdmin';
+my $wiki_admin_pass='AdminPass';
+my $mw = MediaWiki::API->new;
+$mw->{config}->{api_url} = $wiki_url;
+
+# wiki_login <name> <password>
+#
+# Logs the user with <name> and <password> in the global variable
+# of the mediawiki $mw
+sub wiki_login {
+	$mw->login( { lgname => "$_[0]",lgpassword => "$_[1]" } )
+                || die "getpage: login failed";
+}
+
+# wiki_getpage <wiki_page> <dest_path>
+#
+# fetch a page <wiki_page> from the wiki referenced in the global variable
+# $mw and copies its content in directory dest_path
+sub wiki_getpage {
+	my $pagename = $_[0];
+	my $destdir = $_[1];
+	
+	my $page = $mw->get_page( { title => $pagename } );
+	if (!defined($page)) {
+		die "getpage: wiki does not exist";
+	}
+
+	my $content = $page->{'*'};
+	if (!defined($content)) {
+		die "getpage: page does not exist";
+	}
+
+        # Replace spaces by underscore in the page name
+	$pagename=~s/\ /_/;
+	open(my $file, ">$destdir/$pagename.mw");
+	print $file "$content";
+	close ($file);
+}
+
+# wiki_delete_page <page_name>
+#
+# delete the page with name <page_name> from the wiki referenced
+# in the global variable $mw
+sub wiki_delete_page {
+	my $pagename = $_[0];
+
+	my $exist=$mw->get_page({title => $pagename});
+
+	if (defined($exist->{'*'})){
+		$mw->edit({ action => 'delete',
+			        title => $pagename})
+		|| die $mw->{error}->{code} . ": " . $mw->{error}->{details};
+	}
+        else{
+		die "no page with such name found: $pagename\n";
+	}
+}
+
+# wiki_editpage <wiki_page> <wiki_content> <wiki_append>
+#
+# Edit a page named <wiki_page> with content <wiki_content> on the wiki
+# referenced with the global variable $mw
+# If <wiki_append> == true : append <wiki_content> at the end of the actual
+# content of the page <wiki_page>
+# If <wik_page> doesn't exist, that page is created with the <wiki_content>
+sub wiki_editpage {
+	my $wiki_page = $_[0];
+	my $wiki_content = $_[1];
+	my $wiki_append = $_[2];
+
+	my $append = 0;
+	if (defined($wiki_append) && $wiki_append eq 'true') {
+		$append=1;
+	}
+
+	my $previous_text ="";
+
+	if ($append) {
+	my $ref = $mw->get_page( { title => $wiki_page } );
+		$previous_text = $ref->{'*'};
+	}
+
+	my $text = $wiki_content;
+	if (defined($previous_text)) {
+		$text="$previous_text$text";
+	}
+	$mw->edit( { action => 'edit', title => $wiki_page, text => "$text"} );
+}
+
+# wiki_getallpagename
+#
+# Fetch all pages of the wiki referenced by the global variable $mw
+# and print the names of each one in the file all.txt with a new line
+# ("\n") between these.
+sub wiki_getallpagename {
+        # fetch the pages of the wiki
+	$mw->list ( { action => 'query',
+			list => 'allpages',
+			#cmtitle => "Category:Surnames",
+			#cmnamespace => 0,
+			cmlimit=> 500 },
+		{ max => 4, hook => \&cat_names } )
+	        || die $mw->{error}->{code}.": ".$mw->{error}->{details};
+
+	# print the name of each page
+	sub cat_names {
+		my ($ref) = @_;
+
+		open(my $file, ">all.txt");
+		foreach (@$ref) {
+			print $file "$_->{title}\n";
+		}
+		close ($file);
+	}
+}
+
+# Main part of this script: parse the command line arguments
+# and select which function to execute
+my $fct_to_call = shift;
+my $login = $ARGV[0];
+
+if ($login eq "-p")
+{
+	&wiki_login($wiki_admin,$wiki_admin_pass);
+	shift;
+}
+
+switch ($fct_to_call) {
+	case "get_page" { &wiki_getpage($ARGV[0], $ARGV[1])}
+	case "delete_page" { &wiki_delete_page($ARGV[0])}
+	case "edit_page" { &wiki_editpage($ARGV[0], $ARGV[1], $ARGV[2])}
+	case "getallpagename" { &wiki_getallpagename()}
+	else{ die("test-gitmw.pl ERROR: wrong argument")}
+}
+
-- 
1.7.10.2.568.g4c26a3a

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH 3/3] Tests file for git-remote-mediawiki
  2012-06-01 10:41 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Guillaume Sasdy
  2012-06-01 10:41   ` [PATCH 2/3] Test environment of git-remote-mw Guillaume Sasdy
@ 2012-06-01 10:41   ` Guillaume Sasdy
  1 sibling, 0 replies; 22+ messages in thread
From: Guillaume Sasdy @ 2012-06-01 10:41 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, Charles Roussel, Guillaume Sasdy, Simon Cathebras,
	Simon Perrat, Charles Roussel, Julien Khayat

From: Charles Roussel <charles.roussel@ensimag.fr>

Those scripts test the functions of git-remote-mediawiki.
t9360: simple test case for git clone.
t9361: simple test cases for git pull (add page, edit page, delete page) and git push (add file, edit file, delete file).

Signed-off-by: Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
Signed-off-by: Simon Cathebras <Simon.Cathebras@ensimag.imag.fr>
Signed-off-by: Simon Perrat <Simon.Perrat@ensimag.imag.fr>
Signed-off-by: Charles Roussel <Charles.Roussel@ensimag.imag.fr>
Signed-off-by: Julien Khayat <Julien.Khayat@ensimag.imag.fr>
---
 t/t9360-git-mediawiki.sh |  49 +++++++++++++++
 t/t9361-git-mediawiki.sh | 156 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 205 insertions(+)
 create mode 100755 t/t9360-git-mediawiki.sh
 create mode 100755 t/t9361-git-mediawiki.sh

diff --git a/t/t9360-git-mediawiki.sh b/t/t9360-git-mediawiki.sh
new file mode 100755
index 0000000..57e05d8
--- /dev/null
+++ b/t/t9360-git-mediawiki.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+#     Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
+#
+# License: GPL v2 or later
+
+# tests for git-remote-mediawiki
+
+test_description='Test the Git Mediawiki remote helper: git clone'
+
+. ./test-gitmw-lib.sh
+. ./test-lib.sh
+
+if ! test_have_prereq PERL
+then
+	skip_all='skipping gateway git-mw tests, perl not available'
+	test_done
+fi
+
+if [ ! -f /$GIT_BUILD_DIR/git-remote-mediawiki ];
+then
+	skip_all='skipping gateway git-mw tests, no remote mediawiki for git found'
+	test_done
+fi
+
+if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ;
+then
+	skip_all='skipping gateway git-mw tests, no mediawiki found'
+	test_done
+fi
+
+test_expect_success 'git clone works with page added' '
+	wiki_reset &&
+	wiki_editpage foo "hello_world" false &&
+	wiki_editpage bar "hi everybody !" false &&
+	git clone mediawiki::http://localhost/wiki mw_dir &&
+	wiki_getallpage ref_page &&
+	git_content mw_dir ref_page &&
+	wiki_delete_page foo &&
+	wiki_delete_page bar
+'
+
+test_done
diff --git a/t/t9361-git-mediawiki.sh b/t/t9361-git-mediawiki.sh
new file mode 100755
index 0000000..9dd7274
--- /dev/null
+++ b/t/t9361-git-mediawiki.sh
@@ -0,0 +1,156 @@
+#!/bin/sh
+#
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+#     Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
+#
+# License: GPL v2 or later
+
+# tests for git-remote-mediawiki
+
+test_description='Test the Git Mediawiki remote helper: git push and git pull simple test cases'
+
+. ./test-gitmw-lib.sh
+. ./test-lib.sh
+
+if ! test_have_prereq PERL
+then
+	skip_all='skipping gateway git-mw tests, perl not available'
+	test_done
+fi
+
+if [ ! -f /$GIT_BUILD_DIR/git-remote-mediawiki ];
+then
+	skip_all='skipping gateway git-mw tests, no remote mediawiki for git found'
+	test_done
+fi
+
+if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ;
+then
+	skip_all='skipping gateway git-mw tests, no mediawiki found'
+	test_done
+fi
+
+# Create a new file foo.mw in a freshly cloned wiki. Commit and push
+# this file and then check that all files of the repository are similar to
+# the wiki pages.
+test_expect_success 'git push works after adding a file .mw' "
+        wiki_reset &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+        wiki_getallpage ref_page &&
+
+        cd mw_dir &&
+        test ! -f foo.mw && # foo.mw should not exist after wiki_reset &&
+        touch foo.mw &&
+        echo \"hello world\" >> foo.mw &&
+        git add foo.mw &&
+        git commit -m \"foo\" &&
+        git push &&
+        cd .. &&
+
+        rm -rf ref_page &&
+        wiki_getallpage ref_page &&
+        git_content mw_dir ref_page &&
+        rm -rf ref_page &&
+        rm -rf mw_dir
+"
+
+# Create a new page Foo in an empty wiki. Clone the wiki and edit
+# the file foo.mw corresponding to the page Foo. Commit and push
+# then check that all files of the repository are similar to the wiki
+# pages.
+test_expect_success 'git push works after editing a file .mw' "
+        # clone an empty wiki and add a Foo page
+        wiki_reset &&
+        wiki_editpage \"foo\" \"page just created before the git clone\" false &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+
+        cd mw_dir &&
+        echo \"new line added in the file foo.mw\" >> Foo.mw &&
+        git commit -am \"edit file foo.mw\" &&
+        git push &&
+        cd .. &&
+
+        rm -rf ref_page &&
+        wiki_getallpage ref_page &&
+        git_content mw_dir ref_page &&
+        rm -rf ref_page &&
+        rm -rf mw_dir
+"
+
+# Clone a wiki with a page Foo. Remove the corresponding file from the
+# repository. Check that the wiki page has been actually removed.
+test_expect_failure 'git push works after deleting a file' "
+        wiki_reset &&
+        wiki_editpage foo \"wiki page added before git clone\" false &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+
+        cd mw_dir &&
+        git rm Foo.mw &&
+        git commit -am \"git rm delete the wiki page Foo.mw\" &&
+        git push &&
+        cd .. &&
+
+        rm -rf mw_dir &&
+        test ! wiki_page_exist Foo
+"
+
+# Clone an empty wiki. Add a page on the wiki and pull. Check 
+# all files of the repository are similar to the wiki pages.
+test_expect_success 'git pull works after adding a new wiki page' "
+        wiki_reset &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+        wiki_editpage foo \"page just created after the git clone\" false &&
+
+        cd mw_dir &&
+        git pull &&
+        cd .. &&
+
+        rm -rf ref_page &&
+        wiki_getallpage ref_page &&
+        git_content mw_dir ref_page &&
+        rm -rf ref_page &&
+        rm -rf mw_dir
+"
+
+# Clone a wiki with a page Foo. Edit the page foo on the wiki and pull.
+# Check that all files of the repository are similar to the wiki pages.
+test_expect_success 'git pull works after editing a wiki page' "
+        wiki_reset &&
+        wiki_editpage foo \"page just created before the git clone\" false &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+        wiki_editpage foo \"new line added on the wiki\" true &&
+
+        cd mw_dir &&
+        git pull &&
+        cd .. &&
+       
+        rm -rf ref_page &&
+        wiki_getallpage ref_page &&
+        git_content mw_dir ref_page &&
+        rm -rf ref_page
+        rm -rf mw_dir
+"
+
+# Clone a wiki with a page Foo. Remove the wiki page and pull.
+# Check that the corresponding file in the repository has been actually removed.
+test_expect_failure 'git pull works after deleting a wiki page' "
+        wiki_reset &&
+        wiki_editpage foo \"wiki page added before git clone\" false &&
+        git clone mediawiki::http://$SERVER_ADDR/$WIKI_DIR_NAME mw_dir &&
+
+        cd mw_dir &&
+        wiki_delete_page foo
+        git pull &&
+        test ! -f Foo.mw &&
+        cd .. &&
+
+        rm -rf mw_dir
+"
+
+test_done
+
-- 
1.7.10.2.568.g4c26a3a

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Test environment of git-remote-mw
  2012-06-01 10:41   ` [PATCH 2/3] Test environment of git-remote-mw Guillaume Sasdy
@ 2012-06-01 11:49     ` Matthieu Moy
  2012-06-01 14:43       ` Simon.Cathebras
  0 siblings, 1 reply; 22+ messages in thread
From: Matthieu Moy @ 2012-06-01 11:49 UTC (permalink / raw)
  To: Guillaume Sasdy
  Cc: git, Charles Roussel, Simon Cathebras, Simon Perrat,
	Charles Roussel, Julien Khayat

Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr> writes:

>  # CONFIGURATION VARIABLES
> -# You might want to change those ones ...
> +# You might want to change these ones
>  #
>  WIKI_DIR_NAME="wiki"            # Name of the wiki's directory
>  WIKI_DIR_INST="/var/www"        # Directory of the web server
>  TMP="/tmp"                      # Temporary directory for downloads
> -                                # Absolute address needed!
> +                                # Absolute path required!
>  SERVER_ADDR="localhost"         # Web server's address
>  
> -#
>  # CONFIGURATION
> -# You should not change those ones unless you know what you to
> +# You should not change these ones unless you know what you do

I already mentionned in in your v1, but these fixups do not belong to
PATCH 2/3. You do not want reviewers to see your mistakes in PATCH 1/2
and see the fix in PATCH 2/3.

> +wiki_getpage () {
> +	../test-gitmw.pl get_page -p "$1" "$2"
> +}

Any reason why test-gitmw.pl and wiki_getpage have this slightly
different API? The perl version has a "-p" flag, and the shell command
has only positionnal arguments.

I'd rather have a more uniform way to wrap calls to test-gitmw.pl in
shell, like

wiki_<something> () {
	../test-gitmw.pl <something> "$@"
}

Then, you probably want to move the API documentation (i.e. comments you
put before the shell functions) in, or next to the Perl script, and
avoid repeating it in the shell.

> +# git_content <dir_1> <dir_2>
> +#
> +# Compare the contents of directories <dir_1> and <dir_2> with diff
> +# and exits with error 1 if they do not match. The program will
> +# not look into .git in the process.
> +git_content () {

Didn't I already say that the naming was strange? A function that
compares something shouldn't be called just "content".

> +	result=$(diff -r -b --exclude=".git" "$1" "$2")
> +
> +	if echo $result | grep -q ">" ; then

Why grep, when the exit status of diff tells you about the differences
already?

> +# git_exist <rep_name> <file_name>
> +#
> +# Check the existence of <file_name> into the git repository
> +# <rep_name> and exits with error 1 if it is absent.
> +git_exist () {
> +	result=$(find "$1" -type f -name "$2")
> +
> +	if ! echo $result | grep -q "$2" ; then

Missing quotes around $result.

Why do you need grep again? You just want to check whether "$result" is
empty (test -z).

> +		echo "test failed: file $2 does not exist in $1"
> +		exit 1

die

?

> +wiki_page_exist () {
> +	wiki_getpage "$1" .
> +
> +	if test -f "$1".mw ; then
> +		echo "test failed: file $1 not found on wiki"
> +		exit 1

likewise.

> +fail()
> +{

Style: fail () {

Plus, didn't we say "die" was already there for this?

> +        # Replace spaces by underscore in the page name
> +	$pagename=~s/\ /_/;

Indent with space (didn't I already mention that?).

> +my $login = $ARGV[0];
> +
> +if ($login eq "-p")

Feels weird. If you're not sure it's a login, why call the variable
$login?

Any reason not to use Perl's option parsing?

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Test environment of git-remote-mw
  2012-06-01 11:49     ` Matthieu Moy
@ 2012-06-01 14:43       ` Simon.Cathebras
  2012-06-02 10:47         ` Matthieu Moy
  0 siblings, 1 reply; 22+ messages in thread
From: Simon.Cathebras @ 2012-06-01 14:43 UTC (permalink / raw)
  To: Matthieu Moy
  Cc: Guillaume Sasdy, git, Charles Roussel, Simon Perrat,
	Charles Roussel, Julien Khayat

On 01/06/2012 13:49, Matthieu Moy wrote:
> Guillaume Sasdy<guillaume.sasdy@ensimag.imag.fr>  writes:
>
>>   # CONFIGURATION VARIABLES
>> -# You might want to change those ones ...
>> +# You might want to change these ones
>>   #
>>   WIKI_DIR_NAME="wiki"            # Name of the wiki's directory
>>   WIKI_DIR_INST="/var/www"        # Directory of the web server
>>   TMP="/tmp"                      # Temporary directory for downloads
>> -                                # Absolute address needed!
>> +                                # Absolute path required!
>>   SERVER_ADDR="localhost"         # Web server's address
>>
>> -#
>>   # CONFIGURATION
>> -# You should not change those ones unless you know what you to
>> +# You should not change these ones unless you know what you do
> I already mentionned in in your v1, but these fixups do not belong to
> PATCH 2/3. You do not want reviewers to see your mistakes in PATCH 1/2
> and see the fix in PATCH 2/3.
Got it. With the problem experienced yesterday, we had still this issue 
this morning. It is now fixed :).
>> +wiki_getpage () {
>> +	../test-gitmw.pl get_page -p "$1" "$2"
>> +}
> Any reason why test-gitmw.pl and wiki_getpage have this slightly
> different API? The perl version has a "-p" flag, and the shell command
> has only positionnal arguments.
The "-p" flag exists to specify if we have to use the admin login on 
wiki to do the command. For instance, here we fetch a page from the wiki 
with Admin privilege.
Others arguments remains the same.
> I'd rather have a more uniform way to wrap calls to test-gitmw.pl in
> shell, like
>
> wiki_<something>  () {
> 	../test-gitmw.pl<something>  "$@"
> }
Do you suggest we include the "-p" flag in <something> ?
I agree for the use of "$@".
>
> Then, you probably want to move the API documentation (i.e. comments you
> put before the shell functions) in, or next to the Perl script, and
> avoid repeating it in the shell.
>
Ok.
>> +# git_content<dir_1>  <dir_2>
>> +#
>> +# Compare the contents of directories<dir_1>  and<dir_2>  with diff
>> +# and exits with error 1 if they do not match. The program will
>> +# not look into .git in the process.
>> +git_content () {
> Didn't I already say that the naming was strange? A function that
> compares something shouldn't be called just "content".
Sorry, we misunderstood what you mean... Update is coming. What about 
git_diff_directories ?
Because this shell function execute a special instance of diff, matching 
two directories and ignoring blank character.
>> +	result=$(diff -r -b --exclude=".git" "$1" "$2")
>> +
>> +	if echo $result | grep -q ">" ; then
> Why grep, when the exit status of diff tells you about the differences
> already?
>
Good idea for the exit status.
>> +# git_exist<rep_name>  <file_name>
>> +#
>> +# Check the existence of<file_name>  into the git repository
>> +#<rep_name>  and exits with error 1 if it is absent.
>> +git_exist () {
>> +	result=$(find "$1" -type f -name "$2")
>> +
>> +	if ! echo $result | grep -q "$2" ; then
> Missing quotes around $result.
>
> Why do you need grep again? You just want to check whether "$result" is
> empty (test -z).
this function is now erased from our code... Actually, it was really 
useless...
>> +		echo "test failed: file $2 does not exist in $1"
>> +		exit 1
> die
>
> ?
>
>> +wiki_page_exist () {
>> +	wiki_getpage "$1" .
>> +
>> +	if test -f "$1".mw ; then
>> +		echo "test failed: file $1 not found on wiki"
>> +		exit 1
> likewise.
We were supposed to do it with the previous version.
But we are facing some difficulties using die function outside the test 
harness. We wanted to include the file "test-lib.sh" in our own script 
"test-gitmw-lib.sh" to use die. It doesn't work, because the harness 
expect the file "test-gitmw-lib.sh" to be a test script. Wich is not the 
case.

Do you have any Idea about how to fix this problem ?
>> +fail()
>> +{
> Style: fail () {
>
> Plus, didn't we say "die" was already there for this?
Agree, see above.
>> +        # Replace spaces by underscore in the page name
>> +	$pagename=~s/\ /_/;
> Indent with space (didn't I already mention that?).
>
>> +my $login = $ARGV[0];
>> +
>> +if ($login eq "-p")
> Feels weird. If you're not sure it's a login, why call the variable
> $login?
Change on the way. renaming this variable "is_login". Is this ok for you ?
> Any reason not to use Perl's option parsing?
Not at all, we juste didn't thought about it.

-- 
CATHEBRAS Simon

2A-ENSIMAG

Filière Ingéniérie des Systèmes d'Information
Membre Bug-Buster

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Test environment of git-remote-mw
  2012-06-01 14:43       ` Simon.Cathebras
@ 2012-06-02 10:47         ` Matthieu Moy
  2012-06-04 14:13           ` Simon.Cathebras
  0 siblings, 1 reply; 22+ messages in thread
From: Matthieu Moy @ 2012-06-02 10:47 UTC (permalink / raw)
  To: Simon.Cathebras
  Cc: Guillaume Sasdy, git, Charles Roussel, Simon Perrat,
	Charles Roussel, Julien Khayat

"Simon.Cathebras" <Simon.Cathebras@ensimag.imag.fr> writes:

>>> +wiki_getpage () {
>>> +	../test-gitmw.pl get_page -p "$1" "$2"
>>> +}
>> Any reason why test-gitmw.pl and wiki_getpage have this slightly
>> different API? The perl version has a "-p" flag, and the shell command
>> has only positionnal arguments.
> The "-p" flag exists to specify if we have to use the admin login on
> wiki to do the command.

(then, maybe --admin would be a better name?)

> For instance, here we fetch a page from the wiki with Admin privilege.
> Others arguments remains the same.

What I don't understand is why you need the flexibility to choose
between admin and non-admin on the Perl side, and you don't need in on
the shell side.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH 2/3] Test environment of git-remote-mw
  2012-06-02 10:47         ` Matthieu Moy
@ 2012-06-04 14:13           ` Simon.Cathebras
  0 siblings, 0 replies; 22+ messages in thread
From: Simon.Cathebras @ 2012-06-04 14:13 UTC (permalink / raw)
  To: Matthieu Moy
  Cc: Guillaume Sasdy, git, Charles Roussel, Simon Perrat,
	Charles Roussel, Julien Khayat



On 02/06/2012 12:47, Matthieu Moy wrote:
> "Simon.Cathebras"<Simon.Cathebras@ensimag.imag.fr>  writes:
>
>>>> +wiki_getpage () {
>>>> +	../test-gitmw.pl get_page -p "$1" "$2"
>>>> +}
>>> Any reason why test-gitmw.pl and wiki_getpage have this slightly
>>> different API? The perl version has a "-p" flag, and the shell command
>>> has only positionnal arguments.
>> The "-p" flag exists to specify if we have to use the admin login on
>> wiki to do the command.
> (then, maybe --admin would be a better name?)
>
I am ok with this... It would be more understandable.
>> For instance, here we fetch a page from the wiki with Admin privilege.
>> Others arguments remains the same.
> What I don't understand is why you need the flexibility to choose
> between admin and non-admin on the Perl side, and you don't need in on
> the shell side.
>
On one hand, we need to be authentificated as an admin to do some wiki's
operations, like deleting a page for instance. It is needed by the Perl.
On the other hand, we don't need it on the shell side because we believe
that we don't have to bother the user with some authentification
consideration.
I mean, if I intend to delete the page <foo> from wiki, it is easier to
call 'wiki_delete_page foo', than  'wiki_delete_page --user=thingumy
--pass=blahblah foo'.
Does it make sense ? If not, what do you think we should do ?

Simon

-- 
CATHEBRAS Simon

2A-ENSIMAG

Filière Ingéniérie des Systèmes d'Information
Membre Bug-Buster

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH 2/3] Test environment of git-remote-mw
  2012-06-05 13:25 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
@ 2012-06-05 13:25   ` Simon Cathebras
  0 siblings, 0 replies; 22+ messages in thread
From: Simon Cathebras @ 2012-06-05 13:25 UTC (permalink / raw)
  To: git
  Cc: Matthieu.Moy, simon.cathebras, charles.roussel, Guillaume.Sasdy,
	Julien.Khayat, Simon.Perrat, peff, gitster, Guillaume Sasdy,
	Julien Khayat, Simon Perrat, Matthieu Moy

From: Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>

In order to test git-remote-mediawiki, we need a package of functions
to manage a MediaWiki: edit a page, remove a page, fetch a page,
fetch all pages on a given wiki.

We also need functions to compare the content of directories.

Signed-off-by: Simon Cathebras <simon.cathebras@ensimag.imag.fr>
Signed-off-by: Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
Signed-off-by: Julien Khayat <julien.khayat@ensimag.imag.fr>
Signed-off-by: Simon Perrat <simon.perrat@ensimag.imag.fr>
Signed-off-by: Charles Roussel <charles.roussel@ensimag.imag.fr>
Signed-off-by: Matthieu Moy <matthieu.moy@imag.fr>
---
 t/test-gitmw-lib.sh | 105 +++++++++++++++++++++++++++++++
 t/test-gitmw.pl     | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 281 insertions(+)
 create mode 100755 t/test-gitmw.pl

diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
index cebef24..cb5ba19 100755
--- a/t/test-gitmw-lib.sh
+++ b/t/test-gitmw-lib.sh
@@ -26,6 +26,111 @@ DB_INSTALL_SCRIPT="db_install.php"
 WIKI_ADMIN="WikiAdmin"
 WIKI_PASSW="AdminPass"
 
+wiki_getpage () {
+	$GIT_BUILD_DIR/t/test-gitmw.pl get_page "$@"
+}
+
+wiki_delete_page () {
+	$GIT_BUILD_DIR/t/test-gitmw.pl delete_page "$@"
+}
+
+wiki_editpage () {
+	$GIT_BUILD_DIR/t/test-gitmw.pl edit_page "$@"
+}
+
+die () {
+	die_with_status 1 "$@"
+}
+
+die_with_status () {
+	status=$1
+	shift
+	echo >&2 "$*"
+	exit "$status"
+}
+
+# git_diff_directories <dir_git> <dir_wiki>
+#
+# Compare the contents of directories <dir_git> and <dir_wiki> with diff
+# and dies if they do not match. The program will
+# not look into .git in the process.
+# Warning: the first argument MUST be the directory containing the git data
+git_diff_directories () {
+	mkdir -p "$1_tmp"
+	cp "$1"/*.mw "$1_tmp"
+
+	diff -r -b "$1_tmp" "$2"
+
+	if test $? -ne 0
+	then
+		rm -rf "$1_tmp"
+		die "test failed: directories $1 and $2 do not match"
+	fi
+	rm -rf "$1_tmp"
+}
+
+
+# wiki_check_content <file_name> <page_name> 
+#
+# Compares the contents of the file <file_name> and the wiki page
+# <page_name> and exits with error 1 if they do not match.
+wiki_check_content () {
+	mkdir -p wiki_tmp
+	wiki_getpage "$2" wiki_tmp
+	diff -b "$1" wiki_tmp/"$2".mw
+	if test $? -ne 0
+	then
+		rm -rf wiki_tmp
+		die "ERROR: file $2 not found on wiki"
+	fi
+	rm -rf wiki_tmp
+}
+
+# wiki_page_exist <page_name>
+#
+# Check the existence of the page <page_name> on the wiki and exits
+# with error if it is absent from it.
+wiki_page_exist () {
+	wiki_getpage "$1" .
+
+	if test -f "$1".mw ; then
+		rm "$1".mw
+	else
+		die "test failed: file $1 not found on wiki"
+	fi
+}
+
+# wiki_getallpagename
+# 
+# Fetch the name of each page on the wiki.
+wiki_getallpagename () {
+	$GIT_BUILD_DIR/t/test-gitmw.pl getallpagename
+}
+
+# wiki_getallpagecategory <category>
+# 
+# Fetch the name of each page belonging to <category> on the wiki.
+wiki_getallpagecategory () {
+	$GIT_BUILD_DIR/t/test-gitmw.pl getallpagename "$@"
+}
+
+# wiki_getallpage <dest_dir> [<category>]
+#
+# Fetch all the pages from the wiki and place them in the directory
+# <dest_dir>.
+# If <category> is define, then wiki_getallpage fetch the pages included
+# in <category>.
+wiki_getallpage () {
+	if test -z "$2";
+	then
+		wiki_getallpagename
+	else
+		wiki_getallpagecategory "$2"
+	fi
+	mkdir -p "$1"
+	while read -r line; do
+		wiki_getpage "$line" $1;
+	done < all.txt
 }
 
 # Create the SQLite database of the MediaWiki. If the database file already
diff --git a/t/test-gitmw.pl b/t/test-gitmw.pl
new file mode 100755
index 0000000..ff7f63e
--- /dev/null
+++ b/t/test-gitmw.pl
@@ -0,0 +1,176 @@
+#!/usr/bin/perl -w
+# Copyright (C) 2012
+#     Charles Roussel <charles.roussel@ensimag.imag.fr>
+#     Simon Cathebras <simon.cathebras@ensimag.imag.fr>
+#     Julien Khayat <julien.khayat@ensimag.imag.fr>
+#     Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
+#     Simon Perrat <simon.perrat@ensimag.imag.fr>
+# License: GPL v2 or later
+
+# Usage:
+#       ./test-gitmw.pl <command> [argument]*
+# Execute in terminal using the name of the function to call as first
+# parameter, and the function's arguments as following parameters
+#
+# Example:
+#     ./test-gitmw.pl "get_page" foo .
+# will call <wiki_getpage> with arguments <foo> and <.>
+#
+# Available functions are:
+#     "get_page"
+#     "delete_page"
+#     "edit_page"
+#     "getallpagename"
+
+use MediaWiki::API;
+use Switch;
+# URL of the wiki used for the tests
+my $wiki_url="http://localhost/wiki/api.php";
+my $wiki_admin='WikiAdmin';
+my $wiki_admin_pass='AdminPass';
+my $mw = MediaWiki::API->new;
+$mw->{config}->{api_url} = $wiki_url;
+
+# wiki_login <name> <password>
+#
+# Logs the user with <name> and <password> in the global variable
+# of the mediawiki $mw
+sub wiki_login {
+	$mw->login( { lgname => "$_[0]",lgpassword => "$_[1]" } )
+                || die "getpage: login failed";
+}
+
+# wiki_getpage <wiki_page> <dest_path>
+#
+# fetch a page <wiki_page> from the wiki referenced in the global variable
+# $mw and copies its content in directory dest_path
+sub wiki_getpage {
+	my $pagename = $_[0];
+	my $destdir = $_[1];
+	
+	my $page = $mw->get_page( { title => $pagename } );
+	if (!defined($page)) {
+		die "getpage: wiki does not exist";
+	}
+
+	my $content = $page->{'*'};
+	if (!defined($content)) {
+		die "getpage: page does not exist";
+	}
+
+	# Replace spaces by underscore in the page name
+	$pagename=$page->{'title'};
+	$pagename=~s/\ /_/;
+	open(my $file, ">$destdir/$pagename.mw");
+	print $file "$content";
+	close ($file);
+}
+
+# wiki_delete_page <page_name>
+#
+# delete the page with name <page_name> from the wiki referenced
+# in the global variable $mw
+sub wiki_delete_page {
+	my $pagename = $_[0];
+
+	my $exist=$mw->get_page({title => $pagename});
+
+	if (defined($exist->{'*'})){
+		$mw->edit({ action => 'delete',
+			        title => $pagename})
+		|| die $mw->{error}->{code} . ": " . $mw->{error}->{details};
+	} else {
+		die "no page with such name found: $pagename\n";
+	}
+}
+
+# wiki_editpage <wiki_page> <wiki_content> <wiki_append> [<category>]
+#
+# Edit a page named <wiki_page> with content <wiki_content> on the wiki
+# referenced with the global variable $mw
+# If <wiki_append> == true : append <wiki_content> at the end of the actual
+# content of the page <wiki_page>
+# If <wik_page> doesn't exist, that page is created with the <wiki_content>
+sub wiki_editpage {
+	my $wiki_page = $_[0];
+	my $wiki_content = $_[1];
+	my $wiki_append = $_[2];
+
+
+	my $append = 0;
+	if (defined($wiki_append) && $wiki_append eq 'true') {
+		$append=1;
+	}
+
+	my $previous_text ="";
+
+	if ($append) {
+	my $ref = $mw->get_page( { title => $wiki_page } );
+		$previous_text = $ref->{'*'};
+	}
+
+	my $text = $wiki_content;
+	if (defined($previous_text)) {
+		$text="$previous_text$text";
+	}
+	
+	# Eventually, add this page to a category.
+	if (defined($_[3])) {
+		my $category_name="[[Category:$_[3]]]";
+		$text="$text\n $category_name"
+	}
+	$mw->edit( { action => 'edit', title => $wiki_page, text => "$text"} );
+}
+
+
+# wiki_getallpagename [<category>]
+#
+# Fetch all pages of the wiki referenced by the global variable $mw
+# and print the names of each one in the file all.txt with a new line
+# ("\n") between these.
+# If the argument <category> is defined, then this function get only the pages 
+# belonging to <category>.
+sub wiki_getallpagename {
+	# fetch the pages of the wiki
+	if (defined($_[0])) {
+		$mw->list ( { action => 'query',
+				list => 'categorymembers',
+				cmtitle => "Category:$_[0]",
+				cmnamespace => 0,
+				cmlimit=> 500 },
+			{ max => 4, hook => \&cat_names } )
+			|| die $mw->{error}->{code}.": ".$mw->{error}->{details};
+	} else {
+		$mw->list ( { action => 'query',
+				list => 'allpages',
+				#cmnamespace => 0,
+				cmlimit=> 500 },
+			{ max => 4, hook => \&cat_names } )
+			|| die $mw->{error}->{code}.": ".$mw->{error}->{details};
+	}
+	# print the name of each page
+	sub cat_names {
+		my ($ref) = @_;
+
+		open(my $file, ">all.txt");
+		foreach (@$ref) {
+			print $file "$_->{title}\n";
+		}
+		close ($file);
+	}
+}
+
+# Main part of this script: parse the command line arguments
+# and select which function to execute
+my $fct_to_call = shift;
+
+	&wiki_login($wiki_admin,$wiki_admin_pass);
+
+switch ($fct_to_call) {
+	case "get_page" { &wiki_getpage(@ARGV)}
+	case "delete_page" { &wiki_delete_page(@ARGV)}
+	case "edit_page" { &wiki_editpage(@ARGV)}
+	case "getallpagename" { &wiki_getallpagename(@ARGV)}
+	else { die("test-gitmw.pl ERROR: wrong argument")}
+}
+
-- 
1.7.10.2.552.gaa3bb87

^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2012-06-05 13:26 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 16:30 [PATCH/RFC]Test environment for Git-MediaWiki Simon.Cathebras
2012-05-30 17:04 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
2012-05-30 17:04   ` [PATCH 2/3] Test environment of git-remote-mw Simon Cathebras
2012-05-31  7:17     ` Matthieu Moy
2012-06-01  8:53       ` Simon.Cathebras
2012-06-01  9:02         ` Matthieu Moy
2012-06-01  9:21           ` Matthieu Moy
2012-05-30 17:04   ` [PATCH 3/3] Tests file for git-remote-mediawiki Simon Cathebras
2012-05-31  7:19   ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Matthieu Moy
2012-05-31 18:13 ` [PATCH 1/2] FIX: t9360. NEW test t9361 for git pull and git push Guillaume Sasdy
2012-05-31 18:13   ` [PATCH 2/2] FIX: Syntax of shell and perl scripts and posix compliant Guillaume Sasdy
2012-05-31 18:16 ` [PATCH] " Guillaume Sasdy
2012-05-31 18:27 ` Guillaume Sasdy
2012-05-31 18:31 ` [PATCH 1/3] FIX: cmd_* moved to wiki_* in test-gitmw-lib.sh and other files Guillaume Sasdy
2012-06-01 10:41 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Guillaume Sasdy
2012-06-01 10:41   ` [PATCH 2/3] Test environment of git-remote-mw Guillaume Sasdy
2012-06-01 11:49     ` Matthieu Moy
2012-06-01 14:43       ` Simon.Cathebras
2012-06-02 10:47         ` Matthieu Moy
2012-06-04 14:13           ` Simon.Cathebras
2012-06-01 10:41   ` [PATCH 3/3] Tests file for git-remote-mediawiki Guillaume Sasdy
  -- strict thread matches above, loose matches on Subject: below --
2012-06-05 13:20 [Git-MediaWiki] Test environment for Git-MediaWiki Simon.Cathebras
2012-06-05 13:25 ` [PATCH 1/3] Script to install, delete and clear a MediaWiki Simon Cathebras
2012-06-05 13:25   ` [PATCH 2/3] Test environment of git-remote-mw Simon Cathebras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).