From: Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr>
To: git@vger.kernel.org
Cc: Matthieu.Moy@imag.fr, simon.cathebras@ensimag.imag.fr,
charles.roussel@ensimag.imag.fr, Julien.Khayat@ensimag.imag.fr,
Simon.Perrat@ensimag.imag.fr
Subject: [PATCH 1/3] FIX: cmd_* moved to wiki_* in test-gitmw-lib.sh and other files
Date: Thu, 31 May 2012 20:31:50 +0200 [thread overview]
Message-ID: <1338489110-4843-1-git-send-email-guillaume.sasdy@ensimag.imag.fr> (raw)
In-Reply-To: <4FC64B0C.6070507@ensimag.imag.fr>
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
next prev parent reply other threads:[~2012-05-31 18:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Guillaume Sasdy [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338489110-4843-1-git-send-email-guillaume.sasdy@ensimag.imag.fr \
--to=guillaume.sasdy@ensimag.imag.fr \
--cc=Julien.Khayat@ensimag.imag.fr \
--cc=Matthieu.Moy@imag.fr \
--cc=Simon.Perrat@ensimag.imag.fr \
--cc=charles.roussel@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=simon.cathebras@ensimag.imag.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).