git-p4: Clean up branch test cases
authorVitor Antunes <vitor.hda@gmail.com>
Sat, 26 May 2012 09:56:06 +0000 (10:56 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 May 2012 17:46:00 +0000 (10:46 -0700)
Correct submit description in one test and remove not required commands
from another.

Signed-off-by: Vitor Antunes <vitor.hda@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9801-git-p4-branch.sh

index 308b123cfdee28c62ab945cf593d8a28338a5b6f..99fe16b72d448e9b5cf686304cb040c221ad1f44 100755 (executable)
@@ -218,7 +218,7 @@ test_expect_success 'git p4 clone simple branches' '
                cd branch1 &&
                p4 edit file2 &&
                echo file2_ >>file2 &&
-               p4 submit -d "update file2 in branch3" &&
+               p4 submit -d "update file2 in branch1" &&
                cd "$git" &&
                git reset --hard p4/depot/branch1 &&
                git p4 rebase &&
@@ -249,8 +249,6 @@ test_expect_success 'git p4 clone simple branches' '
 #   `- file2
 #   `- file3
 test_expect_success 'git p4 add complex branches' '
-       test_when_finished cleanup_git &&
-       test_create_repo "$git" &&
        (
                cd "$cli" &&
                changelist=$(p4 changes -m1 //depot/... | cut -d" " -f2) &&