diff options
| author | Pete Wyckoff <pw@padd.com> | 2014-01-21 23:16:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-22 16:05:27 (GMT) |
| commit | 0055b56e10f77b1b5f5521b8ba3614f962a09288 (patch) | |
| tree | a4fcc09ebbc5c714f9bb9eca89072370c679550c /t/lib-git-p4.sh | |
| parent | 0577849d2b2bf21b0faedd30938d663389db7926 (diff) | |
| download | git-0055b56e10f77b1b5f5521b8ba3614f962a09288.zip git-0055b56e10f77b1b5f5521b8ba3614f962a09288.tar.gz git-0055b56e10f77b1b5f5521b8ba3614f962a09288.tar.bz2 | |
git p4 test: run as user "author"
The tests use author@example.com as the canonical submitter,
but he does not have an entry in the p4 users database.
This causes the generated change description to complain
that the git and p4 users disagree. The complaint message
is still valid, but isn't useful in tests. It was introduced
in 848de9c (git-p4: warn if git authorship won't be retained,
2011-05-13).
Fix t9813 to use @example.com instead of @localhost due to
change in p4_add_user(). Move the function into the git p4
test library so author can be added at initialization time.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-git-p4.sh')
| -rw-r--r-- | t/lib-git-p4.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index ccd918e..4ff2bb1 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -47,9 +47,10 @@ P4DPORT=$((10669 + ($testid - $git_p4_test_start))) P4PORT=localhost:$P4DPORT P4CLIENT=client +P4USER=author P4EDITOR=: unset P4CHARSET -export P4PORT P4CLIENT P4EDITOR P4CHARSET +export P4PORT P4CLIENT P4USER P4EDITOR P4CHARSET db="$TRASH_DIRECTORY/db" cli="$TRASH_DIRECTORY/cli" @@ -96,12 +97,24 @@ start_p4d() { return 1 fi + # build a p4 user so author@example.com has an entry + p4_add_user author + # build a client client_view "//depot/... //client/..." && return 0 } +p4_add_user() { + name=$1 && + p4 user -f -i <<-EOF + User: $name + Email: $name@example.com + FullName: Dr. $name + EOF +} + kill_p4d() { pid=$(cat "$pidfile") # it had better exist for the first kill |