kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

git-p4: clean-up code style in tests 

Preliminary clean-up of testing libraries for git-p4.

* spaces added to both sides of () in function definitions in lib-git-p4
* tab indentation added to git-p4 tests when <<- redirection is used

Signed-off-by: Jan Durovec <jan.durovec@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jan Durovec 9 years ago committed by Junio C Hamano
parent
e6ac6e1f7d
commit
a98772c63f
2 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      t/lib-git-p4.sh
  2. 60
      t/t9826-git-p4-keep-empty-commits.sh

24
t/lib-git-p4.sh
Unescape View File

@ -33,7 +33,7 @@ fi
# Older versions of perforce were available compiled natively for # Older versions of perforce were available compiled natively for
# cygwin. Those do not accept native windows paths, so make sure # cygwin. Those do not accept native windows paths, so make sure
# not to convert for them. # not to convert for them.
native_path() { native_path () {
path="$1" && path="$1" &&
if test_have_prereq CYGWIN && ! p4 -V | grep -q CYGWIN if test_have_prereq CYGWIN && ! p4 -V | grep -q CYGWIN
then then
@ -49,7 +49,7 @@ native_path() {
# Attention: This function is not safe again against time offset updates # Attention: This function is not safe again against time offset updates
# at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)' # at runtime (e.g. via NTP). The 'clock_gettime(CLOCK_MONOTONIC)'
# function could fix that but it is not in Python until 3.3. # function could fix that but it is not in Python until 3.3.
time_in_seconds() { time_in_seconds () {
python -c 'import time; print int(time.time())' python -c 'import time; print int(time.time())'
} }


@ -75,7 +75,7 @@ git="$TRASH_DIRECTORY/git"
pidfile="$TRASH_DIRECTORY/p4d.pid" pidfile="$TRASH_DIRECTORY/p4d.pid"


# Sometimes "prove" seems to hang on exit because p4d is still running # Sometimes "prove" seems to hang on exit because p4d is still running
cleanup() { cleanup () {
if test -f "$pidfile" if test -f "$pidfile"
then then
kill -9 $(cat "$pidfile") 2>/dev/null && exit 255 kill -9 $(cat "$pidfile") 2>/dev/null && exit 255
@ -89,7 +89,7 @@ trap cleanup EXIT
TMPDIR="$TRASH_DIRECTORY" TMPDIR="$TRASH_DIRECTORY"
export TMPDIR export TMPDIR


start_p4d() { start_p4d () {
mkdir -p "$db" "$cli" "$git" && mkdir -p "$db" "$cli" "$git" &&
rm -f "$pidfile" && rm -f "$pidfile" &&
( (
@ -151,7 +151,7 @@ start_p4d() {
return 0 return 0
} }


p4_add_user() { p4_add_user () {
name=$1 && name=$1 &&
p4 user -f -i <<-EOF p4 user -f -i <<-EOF
User: $name User: $name
@ -160,7 +160,7 @@ p4_add_user() {
EOF EOF
} }


retry_until_success() { retry_until_success () {
timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT)) timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
until "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout until "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout
do do
@ -168,7 +168,7 @@ retry_until_success() {
done done
} }


retry_until_fail() { retry_until_fail () {
timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT)) timeout=$(($(time_in_seconds) + $RETRY_TIMEOUT))
until ! "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout until ! "$@" 2>/dev/null || test $(time_in_seconds) -gt $timeout
do do
@ -176,7 +176,7 @@ retry_until_fail() {
done done
} }


kill_p4d() { kill_p4d () {
pid=$(cat "$pidfile") pid=$(cat "$pidfile")
retry_until_fail kill $pid retry_until_fail kill $pid
retry_until_fail kill -9 $pid retry_until_fail kill -9 $pid
@ -186,13 +186,13 @@ kill_p4d() {
retry_until_fail kill -9 $watchdog_pid retry_until_fail kill -9 $watchdog_pid
} }


cleanup_git() { cleanup_git () {
retry_until_success rm -r "$git" retry_until_success rm -r "$git"
test_must_fail test -d "$git" && test_must_fail test -d "$git" &&
retry_until_success mkdir "$git" retry_until_success mkdir "$git"
} }


marshal_dump() { marshal_dump () {
what=$1 && what=$1 &&
line=${2:-1} && line=${2:-1} &&
cat >"$TRASH_DIRECTORY/marshal-dump.py" <<-EOF && cat >"$TRASH_DIRECTORY/marshal-dump.py" <<-EOF &&
@ -208,7 +208,7 @@ marshal_dump() {
# #
# Construct a client with this list of View lines # Construct a client with this list of View lines
# #
client_view() { client_view () {
( (
cat <<-EOF && cat <<-EOF &&
Client: $P4CLIENT Client: $P4CLIENT
@ -222,7 +222,7 @@ client_view() {
) | p4 client -i ) | p4 client -i
} }


is_cli_file_writeable() { is_cli_file_writeable () {
# cygwin version of p4 does not set read-only attr, # cygwin version of p4 does not set read-only attr,
# will be marked 444 but -w is true # will be marked 444 but -w is true
file="$1" && file="$1" &&

60
t/t9826-git-p4-keep-empty-commits.sh
Unescape View File

@ -47,23 +47,23 @@ test_expect_success 'Clone repo root path with all history' '
git init . && git init . &&
git p4 clone --use-client-spec --destination="$git" //depot@all && git p4 clone --use-client-spec --destination="$git" //depot@all &&
cat >expect <<-\EOF && cat >expect <<-\EOF &&
Remove file 4 Remove file 4
[git-p4: depot-paths = "//depot/": change = 6] [git-p4: depot-paths = "//depot/": change = 6]


Remove file 3 Remove file 3
[git-p4: depot-paths = "//depot/": change = 5] [git-p4: depot-paths = "//depot/": change = 5]


Add file 4 Add file 4
[git-p4: depot-paths = "//depot/": change = 4] [git-p4: depot-paths = "//depot/": change = 4]


Add file 3 Add file 3
[git-p4: depot-paths = "//depot/": change = 3] [git-p4: depot-paths = "//depot/": change = 3]


Add file 2 Add file 2
[git-p4: depot-paths = "//depot/": change = 2] [git-p4: depot-paths = "//depot/": change = 2]


Add file 1 Add file 1
[git-p4: depot-paths = "//depot/": change = 1] [git-p4: depot-paths = "//depot/": change = 1]


EOF EOF
git log --format=%B >actual && git log --format=%B >actual &&
@ -80,23 +80,23 @@ test_expect_success 'Clone repo subdir with all history but keep empty commits'
git config git-p4.keepEmptyCommits true && git config git-p4.keepEmptyCommits true &&
git p4 clone --use-client-spec --destination="$git" //depot@all && git p4 clone --use-client-spec --destination="$git" //depot@all &&
cat >expect <<-\EOF && cat >expect <<-\EOF &&
Remove file 4 Remove file 4
[git-p4: depot-paths = "//depot/": change = 6] [git-p4: depot-paths = "//depot/": change = 6]


Remove file 3 Remove file 3
[git-p4: depot-paths = "//depot/": change = 5] [git-p4: depot-paths = "//depot/": change = 5]


Add file 4 Add file 4
[git-p4: depot-paths = "//depot/": change = 4] [git-p4: depot-paths = "//depot/": change = 4]


Add file 3 Add file 3
[git-p4: depot-paths = "//depot/": change = 3] [git-p4: depot-paths = "//depot/": change = 3]


Add file 2 Add file 2
[git-p4: depot-paths = "//depot/": change = 2] [git-p4: depot-paths = "//depot/": change = 2]


Add file 1 Add file 1
[git-p4: depot-paths = "//depot/": change = 1] [git-p4: depot-paths = "//depot/": change = 1]


EOF EOF
git log --format=%B >actual && git log --format=%B >actual &&
@ -112,14 +112,14 @@ test_expect_success 'Clone repo subdir with all history' '
git init . && git init . &&
git p4 clone --use-client-spec --destination="$git" --verbose //depot@all && git p4 clone --use-client-spec --destination="$git" --verbose //depot@all &&
cat >expect <<-\EOF && cat >expect <<-\EOF &&
Remove file 3 Remove file 3
[git-p4: depot-paths = "//depot/": change = 5] [git-p4: depot-paths = "//depot/": change = 5]


Add file 3 Add file 3
[git-p4: depot-paths = "//depot/": change = 3] [git-p4: depot-paths = "//depot/": change = 3]


Add file 1 Add file 1
[git-p4: depot-paths = "//depot/": change = 1] [git-p4: depot-paths = "//depot/": change = 1]


EOF EOF
git log --format=%B >actual && git log --format=%B >actual &&

Write Preview
Loading…
Cancel
Save