mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
9b6513ac6f
The original t9800 test code has a mix of assorted topics, some of which are big enough to deserve their own homes. Interdependencies between the topics make it confusing when trying to study one in isolation. And it takes so long to run that debugging an individual test is difficult. Split out three big chunks of tests into their own files: t9812-git-p4-wildcards.sh gets the 8 p4 wildcard tests t9813-git-p4-preserve-users.sh gets the 4 --preserve-user tests t9814-git-p4-rename.sh gets the 2 copy and rename tests Test 9800 execution time drops from 29 sec to 9 sec. The sequential time to run all tests is a slower due to the three extra p4d startup/shutdown sequences, but the overall parallel execution time is about the same, at 52 sec. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
153 lines
4.4 KiB
Bash
Executable file
153 lines
4.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git p4 preserve users'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'create files' '
|
|
(
|
|
cd "$cli" &&
|
|
p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i &&
|
|
echo file1 >file1 &&
|
|
echo file2 >file2 &&
|
|
p4 add file1 file2 &&
|
|
p4 submit -d "add files"
|
|
)
|
|
'
|
|
|
|
p4_add_user() {
|
|
name=$1 fullname=$2 &&
|
|
p4 user -f -i <<-EOF &&
|
|
User: $name
|
|
Email: $name@localhost
|
|
FullName: $fullname
|
|
EOF
|
|
p4 passwd -P secret $name
|
|
}
|
|
|
|
p4_grant_admin() {
|
|
name=$1 &&
|
|
{
|
|
p4 protect -o &&
|
|
echo " admin user $name * //depot/..."
|
|
} | p4 protect -i
|
|
}
|
|
|
|
p4_check_commit_author() {
|
|
file=$1 user=$2 &&
|
|
p4 changes -m 1 //depot/$file | grep -q $user
|
|
}
|
|
|
|
make_change_by_user() {
|
|
file=$1 name=$2 email=$3 &&
|
|
echo "username: a change by $name" >>"$file" &&
|
|
git add "$file" &&
|
|
git commit --author "$name <$email>" -m "a change by $name"
|
|
}
|
|
|
|
# Test username support, submitting as user 'alice'
|
|
test_expect_success 'preserve users' '
|
|
p4_add_user alice Alice &&
|
|
p4_add_user bob Bob &&
|
|
p4_grant_admin alice &&
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
echo "username: a change by alice" >>file1 &&
|
|
echo "username: a change by bob" >>file2 &&
|
|
git commit --author "Alice <alice@localhost>" -m "a change by alice" file1 &&
|
|
git commit --author "Bob <bob@localhost>" -m "a change by bob" file2 &&
|
|
git config git-p4.skipSubmitEditCheck true &&
|
|
P4EDITOR=touch P4USER=alice P4PASSWD=secret git p4 commit --preserve-user &&
|
|
p4_check_commit_author file1 alice &&
|
|
p4_check_commit_author file2 bob
|
|
)
|
|
'
|
|
|
|
# Test username support, submitting as bob, who lacks admin rights. Should
|
|
# not submit change to p4 (git diff should show deltas).
|
|
test_expect_success 'refuse to preserve users without perms' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEditCheck true &&
|
|
echo "username-noperms: a change by alice" >>file1 &&
|
|
git commit --author "Alice <alice@localhost>" -m "perms: a change by alice" file1 &&
|
|
P4EDITOR=touch P4USER=bob P4PASSWD=secret &&
|
|
export P4EDITOR P4USER P4PASSWD &&
|
|
test_must_fail git p4 commit --preserve-user &&
|
|
! git diff --exit-code HEAD..p4/master
|
|
)
|
|
'
|
|
|
|
# What happens with unknown author? Without allowMissingP4Users it should fail.
|
|
test_expect_success 'preserve user where author is unknown to p4' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEditCheck true &&
|
|
echo "username-bob: a change by bob" >>file1 &&
|
|
git commit --author "Bob <bob@localhost>" -m "preserve: a change by bob" file1 &&
|
|
echo "username-unknown: a change by charlie" >>file1 &&
|
|
git commit --author "Charlie <charlie@localhost>" -m "preserve: a change by charlie" file1 &&
|
|
P4EDITOR=touch P4USER=alice P4PASSWD=secret &&
|
|
export P4EDITOR P4USER P4PASSWD &&
|
|
test_must_fail git p4 commit --preserve-user &&
|
|
! git diff --exit-code HEAD..p4/master &&
|
|
|
|
echo "$0: repeat with allowMissingP4Users enabled" &&
|
|
git config git-p4.allowMissingP4Users true &&
|
|
git config git-p4.preserveUser true &&
|
|
git p4 commit &&
|
|
git diff --exit-code HEAD..p4/master &&
|
|
p4_check_commit_author file1 alice
|
|
)
|
|
'
|
|
|
|
# If we're *not* using --preserve-user, git-p4 should warn if we're submitting
|
|
# changes that are not all ours.
|
|
# Test: user in p4 and user unknown to p4.
|
|
# Test: warning disabled and user is the same.
|
|
test_expect_success 'not preserving user with mixed authorship' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEditCheck true &&
|
|
p4_add_user derek Derek &&
|
|
|
|
make_change_by_user usernamefile3 Derek derek@localhost &&
|
|
P4EDITOR=cat P4USER=alice P4PASSWD=secret &&
|
|
export P4EDITOR P4USER P4PASSWD &&
|
|
git p4 commit |\
|
|
grep "git author derek@localhost does not match" &&
|
|
|
|
make_change_by_user usernamefile3 Charlie charlie@localhost &&
|
|
git p4 commit |\
|
|
grep "git author charlie@localhost does not match" &&
|
|
|
|
make_change_by_user usernamefile3 alice alice@localhost &&
|
|
git p4 commit |\
|
|
test_must_fail grep "git author.*does not match" &&
|
|
|
|
git config git-p4.skipUserNameCheck true &&
|
|
make_change_by_user usernamefile3 Charlie charlie@localhost &&
|
|
git p4 commit |\
|
|
test_must_fail grep "git author.*does not match" &&
|
|
|
|
p4_check_commit_author usernamefile3 alice
|
|
)
|
|
'
|
|
|
|
test_expect_success 'kill p4d' '
|
|
kill_p4d
|
|
'
|
|
|
|
test_done
|