git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push

This patch provides a set of tests for the pull and push fonctionnality
of git-remote-mediawiki. The actual tests are kept in a separate function
to allow further tests to re-run the same set of commands with different
push and pull strategies.

Signed-off-by: Simon CATHEBRAS <Simon.Cathebras@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: Guillaume SASDY <Guillaume.Sasdy@ensimag.imag.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/mw-to-git/t/push-pull-tests.sh b/contrib/mw-to-git/t/push-pull-tests.sh
new file mode 100644 (file)
index 0000000..6692a0f
--- /dev/null
+++ b/contrib/mw-to-git/t/push-pull-tests.sh
@@ -0,0 +1,144 @@
+test_push_pull () {
+
+       test_expect_success 'Git pull works after adding a new wiki page' '
+               wiki_reset &&
+
+               git clone mediawiki::'"$WIKI_URL"' mw_dir_1 &&
+               wiki_editpage Foo "page created after the git clone" false &&
+
+               (
+                       cd mw_dir_1 &&
+                       git pull
+               ) &&
+
+               wiki_getallpage ref_page_1 &&
+               test_diff_directories mw_dir_1 ref_page_1
+       '
+
+       test_expect_success 'Git pull works after editing a wiki page' '
+               wiki_reset &&
+
+               wiki_editpage Foo "page created before the git clone" false &&
+               git clone mediawiki::'"$WIKI_URL"' mw_dir_2 &&
+               wiki_editpage Foo "new line added on the wiki" true &&
+
+               (
+                       cd mw_dir_2 &&
+                       git pull
+               ) &&
+
+               wiki_getallpage ref_page_2 &&
+               test_diff_directories mw_dir_2 ref_page_2
+       '
+
+       test_expect_success 'git pull works on conflict handled by auto-merge' '
+               wiki_reset &&
+
+               wiki_editpage Foo "1 init
+3
+5
+       " false &&
+               git clone mediawiki::'"$WIKI_URL"' mw_dir_3 &&
+
+               wiki_editpage Foo "1 init
+2 content added on wiki after clone
+3
+5
+       " false &&
+
+               (
+                       cd mw_dir_3 &&
+               echo "1 init
+3
+4 content added on git after clone
+5
+" >Foo.mw &&
+                       git commit -am "conflicting change on foo" &&
+                       git pull &&
+                       git push
+               )
+       '
+
+       test_expect_success 'Git push works after adding a file .mw' '
+               wiki_reset &&
+               git clone mediawiki::'"$WIKI_URL"' mw_dir_4 &&
+               wiki_getallpage ref_page_4 &&
+               (
+                       cd mw_dir_4 &&
+                       test_path_is_missing Foo.mw &&
+                       touch Foo.mw &&
+                       echo "hello world" >>Foo.mw &&
+                       git add Foo.mw &&
+                       git commit -m "Foo" &&
+                       git push
+               ) &&
+               wiki_getallpage ref_page_4 &&
+               test_diff_directories mw_dir_4 ref_page_4
+       '
+
+       test_expect_success 'Git push works after editing a file .mw' '
+               wiki_reset &&
+               wiki_editpage "Foo" "page created before the git clone" false &&
+               git clone mediawiki::'"$WIKI_URL"' mw_dir_5 &&
+
+               (
+                       cd mw_dir_5 &&
+                       echo "new line added in the file Foo.mw" >>Foo.mw &&
+                       git commit -am "edit file Foo.mw" &&
+                       git push
+               ) &&
+
+               wiki_getallpage ref_page_5 &&
+               test_diff_directories mw_dir_5 ref_page_5
+       '
+
+       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::'"$WIKI_URL"' mw_dir_6 &&
+
+               (
+                       cd mw_dir_6 &&
+                       git rm Foo.mw &&
+                       git commit -am "page Foo.mw deleted" &&
+                       git push
+               ) &&
+
+               test ! wiki_page_exist Foo
+       '
+
+       test_expect_success 'Merge conflict expected and solving it' '
+               wiki_reset &&
+
+               git clone mediawiki::'"$WIKI_URL"' mw_dir_7 &&
+               wiki_editpage Foo "1 conflict
+3 wiki
+4" false &&
+
+               (
+                       cd mw_dir_7 &&
+               echo "1 conflict
+2 git
+4" >Foo.mw &&
+                       git add Foo.mw &&
+                       git commit -m "conflict created" &&
+                       test_must_fail git pull &&
+                       "$PERL_PATH" -pi -e "s/[<=>].*//g" Foo.mw &&
+                       git commit -am "merge conflict solved" &&
+                       git push
+               )
+       '
+
+       test_expect_failure 'git pull works after deleting a wiki page' '
+               wiki_reset &&
+               wiki_editpage Foo "wiki page added before the git clone" false &&
+               git clone mediawiki::'"$WIKI_URL"' mw_dir_8 &&
+
+               wiki_delete_page Foo &&
+               (
+                       cd mw_dir_8 &&
+                       git pull &&
+                       test_path_is_missing Foo.mw
+               )
+       '
+}

diff --git a/contrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh b/contrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh
new file mode 100755 (executable)
index 0000000..9ea2014
--- /dev/null
+++ b/contrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh
@@ -0,0 +1,24 @@
+#!/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>
+#
+# 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
+. ./push-pull-tests.sh
+. $TEST_DIRECTORY/test-lib.sh
+
+test_check_precond
+
+test_push_pull
+
+test_done