mirror of
https://github.com/git/git.git
synced 2024-10-20 20:28:13 +02:00
68b2859389
Some p4 failures result in an error, but the info['code'] is not set. These include a bad p4 executable, or a core dump from p4, and other odd internal errors where p4 fails to generate proper marshaled output. Make sure the info key exists before using it to avoid a python traceback. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
69 lines
1.4 KiB
Bash
Executable File
69 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git-p4 tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
( p4 -h && p4d -h ) >/dev/null 2>&1 || {
|
|
skip_all='skipping git-p4 tests; no p4 or p4d'
|
|
test_done
|
|
}
|
|
|
|
GITP4=$GIT_BUILD_DIR/contrib/fast-import/git-p4
|
|
P4DPORT=10669
|
|
|
|
db="$TRASH_DIRECTORY/db"
|
|
cli="$TRASH_DIRECTORY/cli"
|
|
git="$TRASH_DIRECTORY/git"
|
|
|
|
test_debug 'echo p4d -q -d -r "$db" -p $P4DPORT'
|
|
test_expect_success setup '
|
|
mkdir -p "$db" &&
|
|
p4d -q -d -r "$db" -p $P4DPORT &&
|
|
mkdir -p "$cli" &&
|
|
mkdir -p "$git" &&
|
|
export P4PORT=localhost:$P4DPORT
|
|
'
|
|
|
|
test_expect_success 'add p4 files' '
|
|
cd "$cli" &&
|
|
p4 client -i <<-EOF &&
|
|
Client: client
|
|
Description: client
|
|
Root: $cli
|
|
View: //depot/... //client/...
|
|
EOF
|
|
export P4CLIENT=client &&
|
|
echo file1 >file1 &&
|
|
p4 add file1 &&
|
|
p4 submit -d "file1" &&
|
|
cd "$TRASH_DIRECTORY"
|
|
'
|
|
|
|
test_expect_success 'basic git-p4 clone' '
|
|
"$GITP4" clone --dest="$git" //depot &&
|
|
rm -rf "$git" && mkdir "$git"
|
|
'
|
|
|
|
test_expect_success 'exit when p4 fails to produce marshaled output' '
|
|
badp4dir="$TRASH_DIRECTORY/badp4dir" &&
|
|
mkdir -p "$badp4dir" &&
|
|
cat >"$badp4dir"/p4 <<-EOF &&
|
|
#!$SHELL_PATH
|
|
exit 1
|
|
EOF
|
|
chmod 755 "$badp4dir"/p4 &&
|
|
PATH="$badp4dir:$PATH" "$GITP4" clone --dest="$git" //depot >errs 2>&1 ; retval=$? &&
|
|
test $retval -eq 1 &&
|
|
test_must_fail grep -q Traceback errs
|
|
'
|
|
|
|
test_expect_success 'shutdown' '
|
|
pid=`pgrep -f p4d` &&
|
|
test -n "$pid" &&
|
|
test_debug "ps wl `echo $pid`" &&
|
|
kill $pid
|
|
'
|
|
|
|
test_done
|