Re: [PATCH v3 4/4] git-p4: Add simple test case for branch import
From: Pete Wyckoff <hidden>
Date: 2016-06-15 22:51:51
Subsystem:
the rest · Maintainer:
Linus Torvalds
vitor.hda@gmail.com wrote on Fri, 19 Aug 2011 00:44 +0100:
Create a basic branch structure in P4 and clone it with git-p4. Also, make an update on P4 side and check if git-p4 imports it correctly. The branch structure is created in such a way that git-p4 will fail to import updates if patch "git-p4: Correct branch base depot path detection" is not applied.
Here are some minor style edits to this test. -- Pete -----------------8<-----------------------
From 958effaad24d129ad472b48f3a691c7e7de2e918 Mon Sep 17 00:00:00 2001
From: Pete Wyckoff <redacted> Date: Sat, 20 Aug 2011 14:24:31 -0400 Subject: [PATCH 2/4] git-p4: simple branch tests edits More review comments. Signed-off-by: Pete Wyckoff <redacted> --- t/t9800-git-p4.sh | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh
index bbf1485..5bcb8b4 100755
--- a/t/t9800-git-p4.sh
+++ b/t/t9800-git-p4.sh@@ -412,7 +412,7 @@ test_expect_success 'add simple p4 branches' ' cd branch1 && echo file1 >file1 && echo file2 >file2 && - p4 add file* && + p4 add file1 file2 && p4 submit -d "branch1" && p4 integrate //depot/branch1/... //depot/branch2/... && p4 submit -d "branch2" &&
@@ -432,13 +432,12 @@ test_expect_success 'add simple p4 branches' ' # Finally, make an update to branch1 on P4 side to check if it is imported # correctly by git-p4. test_expect_success 'git-p4 clone simple branches' ' - git init "$git" && + test_when_finished cleanup_git && + test_create_repo "$git" && cd "$git" && git config git-p4.branchList branch1:branch2 && git config --add git-p4.branchList branch1:branch3 && - cd "$TRASH_DIRECTORY" && - "$GITP4" clone --dest="$git" --detect-branches //depot@all && - cd "$git" && + "$GITP4" clone --dest=. --detect-branches //depot@all && git log --all --graph --decorate --stat && git reset --hard p4/depot/branch1 && test -f file1 &&
@@ -448,7 +447,7 @@ test_expect_success 'git-p4 clone simple branches' ' git reset --hard p4/depot/branch2 && test -f file1 && test -f file2 && - test \! -z file3 && + test ! -f file3 && ! grep -q update file2 && git reset --hard p4/depot/branch3 && test -f file1 &&
@@ -458,14 +457,12 @@ test_expect_success 'git-p4 clone simple branches' ' cd "$cli" && cd branch1 && p4 edit file2 && - echo file2_ >> file2 && + echo file2_ >>file2 && p4 submit -d "update file2 in branch3" && cd "$git" && git reset --hard p4/depot/branch1 && "$GITP4" rebase && - grep -q file2_ file2 && - cd "$TRASH_DIRECTORY" && - rm -rf "$git" && mkdir "$git" + grep -q file2_ file2 ' # Create a complex branch structure in P4 depot to check if they are correctly
--
1.7.5.4