From: Pete Wyckoff Date: Wed, 16 Mar 2011 20:53:53 GMT Subject: [PATCH 2/2] git-p4: test sync new branch Message-ID: <20110316205353.GB23387@arf.padd.com> In-Reply-To: <20110316205008.GA22702@arf.padd.com> Add two new unit tests. One to test the feature that that was added in e32e00d, and another to test the regression that was fixed in the parent to this commit. Signed-off-by: Pete Wyckoff --- t/t9800-git-p4.sh | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh index abe7c64..a523473 100755 --- a/t/t9800-git-p4.sh +++ b/t/t9800-git-p4.sh @@ -61,6 +61,29 @@ test_expect_success 'git-p4 clone @all' ' rm -rf "$git" && mkdir "$git" ' +test_expect_success 'git-p4 sync uninitialized repo' ' + test_create_repo "$git" && + cd "$git" && + test_must_fail "$GITP4" sync && + rm -rf "$git" && mkdir "$git" +' + +# +# Create a git repo by hand. Add a commit so that HEAD is valid. +# Test imports a new p4 repository into a new git branch. +# +test_expect_success 'git-p4 sync new branch' ' + test_create_repo "$git" && + 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_expect_success 'exit when p4 fails to produce marshaled output' ' badp4dir="$TRASH_DIRECTORY/badp4dir" && mkdir -p "$badp4dir" && -- 1.7.4.1