mirror of
https://github.com/git/git.git
synced 2024-12-19 14:54:07 +08:00
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>
102 lines
2.1 KiB
Bash
Executable File
102 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 skipSubmitEdit config variables'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'init depot' '
|
|
(
|
|
cd "$cli" &&
|
|
echo file1 >file1 &&
|
|
p4 add file1 &&
|
|
p4 submit -d "change 1"
|
|
)
|
|
'
|
|
|
|
# this works because P4EDITOR is set to true
|
|
test_expect_success 'no config, unedited, say yes' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 2" &&
|
|
echo y | git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 2 wc
|
|
)
|
|
'
|
|
|
|
test_expect_success 'no config, unedited, say no' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 3 (not really)" &&
|
|
printf "bad response\nn\n" | test_expect_code 1 git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 2 wc
|
|
)
|
|
'
|
|
|
|
test_expect_success 'skipSubmitEdit' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
# will fail if editor is even invoked
|
|
git config core.editor /bin/false &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 3" &&
|
|
git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 3 wc
|
|
)
|
|
'
|
|
|
|
test_expect_success 'skipSubmitEditCheck' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEditCheck true &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 4" &&
|
|
git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 4 wc
|
|
)
|
|
'
|
|
|
|
# check the normal case, where the template really is edited
|
|
test_expect_success 'no config, edited' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
test_when_finished "rm ed.sh" &&
|
|
cat >ed.sh <<-EOF &&
|
|
#!$SHELL_PATH
|
|
sleep 1
|
|
touch "\$1"
|
|
exit 0
|
|
EOF
|
|
chmod 755 ed.sh &&
|
|
(
|
|
cd "$git" &&
|
|
echo line >>file1 &&
|
|
git commit -a -m "change 5" &&
|
|
P4EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" &&
|
|
export P4EDITOR &&
|
|
git p4 submit &&
|
|
p4 changes //depot/... >wc &&
|
|
test_line_count = 5 wc
|
|
)
|
|
'
|
|
|
|
test_done
|