99e37c2560
Use 'test_atexit' to run cleanup commands to stop 'p4d' at the end of
the test script or upon interrupt or failure, as it is shorter,
simpler, and more robust than registering such cleanup commands in the
trap on EXIT in the test scripts.
Note that one of the test scripts, 't9801-git-p4-branch.sh', stops and
then re-starts 'p4d' twice in the middle of the script; take care that
the cleanup functions to stop 'p4d' are only registered once.
Note also that 'git p4' tests invoke different functions in the trap
on EXIT ('cleanup') and in the last test before 'test_done'
('kill_p4d'). Register both of these functions with 'test_atexit' for
now, and a a later patch in this series will then clean up the
redundancy.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
58 lines
1.2 KiB
Bash
Executable File
58 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Clone repositories and map users'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'Create a repo with different users' '
|
|
client_view "//depot/... //client/..." &&
|
|
(
|
|
cd "$cli" &&
|
|
|
|
>author.txt &&
|
|
p4 add author.txt &&
|
|
p4 submit -d "Add file author\\n" &&
|
|
|
|
P4USER=mmax &&
|
|
>max.txt &&
|
|
p4 add max.txt &&
|
|
p4 submit -d "Add file max" &&
|
|
|
|
P4USER=eri &&
|
|
>moritz.txt &&
|
|
p4 add moritz.txt &&
|
|
p4 submit -d "Add file moritz" &&
|
|
|
|
P4USER=no &&
|
|
>nobody.txt &&
|
|
p4 add nobody.txt &&
|
|
p4 submit -d "Add file nobody"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'Clone repo root path with all history' '
|
|
client_view "//depot/... //client/..." &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git init . &&
|
|
git config --add git-p4.mapUser "mmax = Max Musterman <max@example.com> " &&
|
|
git config --add git-p4.mapUser " eri=Erika Musterman <erika@example.com>" &&
|
|
git p4 clone --use-client-spec --destination="$git" //depot@all &&
|
|
cat >expect <<-\EOF &&
|
|
no <no@client>
|
|
Erika Musterman <erika@example.com>
|
|
Max Musterman <max@example.com>
|
|
Dr. author <author@example.com>
|
|
EOF
|
|
git log --format="%an <%ae>" >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_done
|