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>
49 lines
917 B
Bash
Executable File
49 lines
917 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 errors'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'add p4 files' '
|
|
(
|
|
cd "$cli" &&
|
|
echo file1 >file1 &&
|
|
p4 add file1 &&
|
|
p4 submit -d "file1"
|
|
)
|
|
'
|
|
|
|
# after this test, the default user requires a password
|
|
test_expect_success 'error handling' '
|
|
git p4 clone --dest="$git" //depot@all &&
|
|
(
|
|
cd "$git" &&
|
|
P4PORT=: test_must_fail git p4 submit 2>errmsg
|
|
) &&
|
|
p4 passwd -P newpassword &&
|
|
(
|
|
P4PASSWD=badpassword &&
|
|
export P4PASSWD &&
|
|
test_must_fail git p4 clone //depot/foo 2>errmsg &&
|
|
grep -q "failure accessing depot.*P4PASSWD" errmsg
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ticket logged out' '
|
|
P4TICKETS="$cli/tickets" &&
|
|
echo "newpassword" | p4 login &&
|
|
(
|
|
cd "$git" &&
|
|
test_commit "ticket-auth-check" &&
|
|
p4 logout &&
|
|
test_must_fail git p4 submit 2>errmsg &&
|
|
grep -q "failure accessing depot" errmsg
|
|
)
|
|
'
|
|
|
|
test_done
|