git-p4: use test_when_finished in tests

Cleanup nicely when tests fail.  This avoids many duplicated
lines in the tests, and adds cleanup in a couple of tests that
did not have it.  When one fails, now all the rest will not
fail too.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh
index 33b0127651da0c4c178e62c269179b641e15f9f6..aec3ba1641ca368635214e48cc15dbb8b7c2070a 100755 (executable)
--- a/t/t9800-git-p4.sh
+++ b/t/t9800-git-p4.sh
@@ -45,29 +45,33 @@ test_expect_success 'add p4 files' '
        cd "$TRASH_DIRECTORY"
 '
 
        cd "$TRASH_DIRECTORY"
 '
 

+cleanup_git() {
+       cd "$TRASH_DIRECTORY" &&
+       rm -rf "$git" &&
+       mkdir "$git"
+}
+

 test_expect_success 'basic git-p4 clone' '
        "$GITP4" clone --dest="$git" //depot &&
 test_expect_success 'basic git-p4 clone' '
        "$GITP4" clone --dest="$git" //depot &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        git log --oneline >lines &&
        cd "$git" &&
        git log --oneline >lines &&

-       test_line_count = 1 lines &&
-       cd .. &&
-       rm -rf "$git" && mkdir "$git"
+       test_line_count = 1 lines

 '
 
 test_expect_success 'git-p4 clone @all' '
        "$GITP4" clone --dest="$git" //depot@all &&
 '
 
 test_expect_success 'git-p4 clone @all' '
        "$GITP4" clone --dest="$git" //depot@all &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        git log --oneline >lines &&
        cd "$git" &&
        git log --oneline >lines &&

-       test_line_count = 2 lines &&
-       cd .. &&
-       rm -rf "$git" && mkdir "$git"
+       test_line_count = 2 lines

 '
 
 test_expect_success 'git-p4 sync uninitialized repo' '
        test_create_repo "$git" &&
 '
 
 test_expect_success 'git-p4 sync uninitialized repo' '
        test_create_repo "$git" &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        cd "$git" &&

-       test_must_fail "$GITP4" sync &&
-       rm -rf "$git" && mkdir "$git"
+       test_must_fail "$GITP4" sync

 '
 
 #
 '
 
 #


@@ -76,19 +80,18 @@ test_expect_success 'git-p4 sync uninitialized repo' '
 #
 test_expect_success 'git-p4 sync new branch' '
        test_create_repo "$git" &&
 #
 test_expect_success 'git-p4 sync new branch' '
        test_create_repo "$git" &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        test_commit head &&
        "$GITP4" sync --branch=refs/remotes/p4/depot //depot@all &&
        git log --oneline p4/depot >lines &&
        cd "$git" &&
        test_commit head &&
        "$GITP4" sync --branch=refs/remotes/p4/depot //depot@all &&
        git log --oneline p4/depot >lines &&

-       cat lines &&
-       test_line_count = 2 lines &&
-       cd .. &&
-       rm -rf "$git" && mkdir "$git"
+       test_line_count = 2 lines

 '
 
 test_expect_success 'exit when p4 fails to produce marshaled output' '
        badp4dir="$TRASH_DIRECTORY/badp4dir" &&
        mkdir -p "$badp4dir" &&
 '
 
 test_expect_success 'exit when p4 fails to produce marshaled output' '
        badp4dir="$TRASH_DIRECTORY/badp4dir" &&
        mkdir -p "$badp4dir" &&

+       test_when_finished "rm -rf $badp4dir" &&

        cat >"$badp4dir"/p4 <<-EOF &&
        #!$SHELL_PATH
        exit 1
        cat >"$badp4dir"/p4 <<-EOF &&
        #!$SHELL_PATH
        exit 1


@@ -106,29 +109,26 @@ test_expect_success 'add p4 files with wildcards in the names' '
        echo file-wild-at >file-wild@at &&
        echo file-wild-percent >file-wild%percent &&
        p4 add -f file-wild* &&
        echo file-wild-at >file-wild@at &&
        echo file-wild-percent >file-wild%percent &&
        p4 add -f file-wild* &&

-       p4 submit -d "file wildcards" &&
-       cd "$TRASH_DIRECTORY"
+       p4 submit -d "file wildcards"

 '
 
 test_expect_success 'wildcard files git-p4 clone' '
        "$GITP4" clone --dest="$git" //depot &&
 '
 
 test_expect_success 'wildcard files git-p4 clone' '
        "$GITP4" clone --dest="$git" //depot &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        test -f file-wild#hash &&
        test -f file-wild\*star &&
        test -f file-wild@at &&
        cd "$git" &&
        test -f file-wild#hash &&
        test -f file-wild\*star &&
        test -f file-wild@at &&

-       test -f file-wild%percent &&
-       cd "$TRASH_DIRECTORY" &&
-       rm -rf "$git" && mkdir "$git"
+       test -f file-wild%percent

 '
 
 test_expect_success 'clone bare' '
        "$GITP4" clone --dest="$git" --bare //depot &&
 '
 
 test_expect_success 'clone bare' '
        "$GITP4" clone --dest="$git" --bare //depot &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        test ! -d .git &&
        bare=`git config --get core.bare` &&
        cd "$git" &&
        test ! -d .git &&
        bare=`git config --get core.bare` &&

-       test "$bare" = true &&
-       cd "$TRASH_DIRECTORY" &&
-       rm -rf "$git" && mkdir "$git"
+       test "$bare" = true

 '
 
 p4_add_user() {
 '
 
 p4_add_user() {


@@ -173,6 +173,7 @@ test_expect_success 'preserve users' '
        p4_add_user bob Bob &&
        p4_grant_admin alice &&
        "$GITP4" clone --dest="$git" //depot &&
        p4_add_user bob Bob &&
        p4_grant_admin alice &&
        "$GITP4" clone --dest="$git" //depot &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        echo "username: a change by alice" >> file1 &&
        echo "username: a change by bob" >> file2 &&
        cd "$git" &&
        echo "username: a change by alice" >> file1 &&
        echo "username: a change by bob" >> file2 &&


@@ -181,27 +182,25 @@ test_expect_success 'preserve users' '
        git config git-p4.skipSubmitEditCheck true &&
        P4EDITOR=touch P4USER=alice P4PASSWD=secret "$GITP4" commit --preserve-user &&
        p4_check_commit_author file1 alice &&
        git config git-p4.skipSubmitEditCheck true &&
        P4EDITOR=touch P4USER=alice P4PASSWD=secret "$GITP4" commit --preserve-user &&
        p4_check_commit_author file1 alice &&

-       p4_check_commit_author file2 bob &&
-       cd "$TRASH_DIRECTORY" &&
-       rm -rf "$git" && mkdir "$git"
+       p4_check_commit_author file2 bob

 '
 
 # Test username support, submitting as bob, who lacks admin rights. Should
 # not submit change to p4 (git diff should show deltas).
 test_expect_success 'refuse to preserve users without perms' '
        "$GITP4" clone --dest="$git" //depot &&
 '
 
 # Test username support, submitting as bob, who lacks admin rights. Should
 # not submit change to p4 (git diff should show deltas).
 test_expect_success 'refuse to preserve users without perms' '
        "$GITP4" clone --dest="$git" //depot &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        echo "username-noperms: a change by alice" >> file1 &&
        git commit --author "Alice <alice@localhost>" -m "perms: a change by alice" file1 &&
        ! P4EDITOR=touch P4USER=bob P4PASSWD=secret "$GITP4" commit --preserve-user &&
        cd "$git" &&
        echo "username-noperms: a change by alice" >> file1 &&
        git commit --author "Alice <alice@localhost>" -m "perms: a change by alice" file1 &&
        ! P4EDITOR=touch P4USER=bob P4PASSWD=secret "$GITP4" commit --preserve-user &&

-       ! git diff --exit-code HEAD..p4/master > /dev/null &&
-       cd "$TRASH_DIRECTORY" &&
-       rm -rf "$git" && mkdir "$git"
+       ! git diff --exit-code HEAD..p4/master > /dev/null

 '
 
 # What happens with unknown author? Without allowMissingP4Users it should fail.
 test_expect_success 'preserve user where author is unknown to p4' '
        "$GITP4" clone --dest="$git" //depot &&
 '
 
 # What happens with unknown author? Without allowMissingP4Users it should fail.
 test_expect_success 'preserve user where author is unknown to p4' '
        "$GITP4" clone --dest="$git" //depot &&

+       test_when_finished cleanup_git &&

        cd "$git" &&
        git config git-p4.skipSubmitEditCheck true
        echo "username-bob: a change by bob" >> file1 &&
        cd "$git" &&
        git config git-p4.skipSubmitEditCheck true
        echo "username-bob: a change by bob" >> file1 &&


@@ -215,9 +214,7 @@ test_expect_success 'preserve user where author is unknown to p4' '
        git config git-p4.preserveUser true &&
        P4EDITOR=touch P4USER=alice P4PASSWD=secret "$GITP4" commit &&
        git diff --exit-code HEAD..p4/master > /dev/null &&
        git config git-p4.preserveUser true &&
        P4EDITOR=touch P4USER=alice P4PASSWD=secret "$GITP4" commit &&
        git diff --exit-code HEAD..p4/master > /dev/null &&

-       p4_check_commit_author file1 alice &&
-       cd "$TRASH_DIRECTORY" &&
-       rm -rf "$git" && mkdir "$git"
+       p4_check_commit_author file1 alice

 '
 
 # If we're *not* using --preserve-user, git-p4 should warn if we're submitting
 '
 
 # If we're *not* using --preserve-user, git-p4 should warn if we're submitting


@@ -226,31 +223,29 @@ test_expect_success 'preserve user where author is unknown to p4' '
 # Test: warning disabled and user is the same.
 test_expect_success 'not preserving user with mixed authorship' '
        "$GITP4" clone --dest="$git" //depot &&
 # Test: warning disabled and user is the same.
 test_expect_success 'not preserving user with mixed authorship' '
        "$GITP4" clone --dest="$git" //depot &&

-       (
-               cd "$git" &&
-               git config git-p4.skipSubmitEditCheck true &&
-               p4_add_user derek Derek &&
-
-               make_change_by_user usernamefile3 Derek derek@localhost &&
-               P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
-               grep "git author derek@localhost does not match" actual &&
-
-               make_change_by_user usernamefile3 Charlie charlie@localhost &&
-               P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
-               grep "git author charlie@localhost does not match" actual &&
-
-               make_change_by_user usernamefile3 alice alice@localhost &&
-               P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
-               ! grep "git author.*does not match" actual &&
-
-               git config git-p4.skipUserNameCheck true &&
-               make_change_by_user usernamefile3 Charlie charlie@localhost &&
-               P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
-               ! grep "git author.*does not match" actual &&
-
-               p4_check_commit_author usernamefile3 alice
-       ) &&
-       rm -rf "$git" && mkdir "$git"
+       test_when_finished cleanup_git &&
+       cd "$git" &&
+       git config git-p4.skipSubmitEditCheck true &&
+       p4_add_user derek Derek &&
+
+       make_change_by_user usernamefile3 Derek derek@localhost &&
+       P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
+       grep "git author derek@localhost does not match" actual &&
+
+       make_change_by_user usernamefile3 Charlie charlie@localhost &&
+       P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
+       grep "git author charlie@localhost does not match" actual &&
+
+       make_change_by_user usernamefile3 alice alice@localhost &&
+       P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
+       ! grep "git author.*does not match" actual &&
+
+       git config git-p4.skipUserNameCheck true &&
+       make_change_by_user usernamefile3 Charlie charlie@localhost &&
+       P4EDITOR=cat P4USER=alice P4PASSWD=secret "$GITP4" commit >actual &&
+       ! grep "git author.*does not match" actual &&
+
+       p4_check_commit_author usernamefile3 alice

 '
 
 
 '