Skip to content

Commit

Permalink
git-p4: test sync new branch
Browse files Browse the repository at this point in the history
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 <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Pete Wyckoff authored and Junio C Hamano committed Mar 16, 2011
1 parent accad8e commit 27c6000
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions t/t9800-git-p4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" &&
Expand Down

0 comments on commit 27c6000

Please sign in to comment.