t5521: fix and modernize
All of these tests were bogus, as they created new directory and tried to run "git pull" without even running "git init" in there. They were mucking with the repository in $TEST_DIRECTORY. While fixing it, modernize the style not to chdir around outside of subshell. Otherwise a failed test will take us to an unexpected directory and we need to chdir back to the test directory in each test, which is ugly and error prone. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e923eaeb90
commit
13e65fe631
@ -4,8 +4,6 @@ test_description='pull options'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
D=`pwd`
|
||||
|
||||
test_expect_success 'setup' '
|
||||
mkdir parent &&
|
||||
(cd parent && git init &&
|
||||
@ -13,48 +11,44 @@ test_expect_success 'setup' '
|
||||
git commit -m one)
|
||||
'
|
||||
|
||||
cd "$D"
|
||||
|
||||
test_expect_success 'git pull -q' '
|
||||
mkdir clonedq &&
|
||||
cd clonedq &&
|
||||
git pull -q "$D/parent" >out 2>err &&
|
||||
test ! -s out
|
||||
(cd clonedq && git init &&
|
||||
git pull -q "../parent" >out 2>err &&
|
||||
test ! -s err &&
|
||||
test ! -s out)
|
||||
'
|
||||
|
||||
cd "$D"
|
||||
|
||||
test_expect_success 'git pull' '
|
||||
mkdir cloned &&
|
||||
cd cloned &&
|
||||
git pull "$D/parent" >out 2>err &&
|
||||
test -s out
|
||||
(cd cloned && git init &&
|
||||
git pull "../parent" >out 2>err &&
|
||||
test -s err &&
|
||||
test ! -s out)
|
||||
'
|
||||
cd "$D"
|
||||
|
||||
test_expect_success 'git pull -v' '
|
||||
mkdir clonedv &&
|
||||
cd clonedv &&
|
||||
git pull -v "$D/parent" >out 2>err &&
|
||||
test -s out
|
||||
(cd clonedv && git init &&
|
||||
git pull -v "../parent" >out 2>err &&
|
||||
test -s err &&
|
||||
test ! -s out)
|
||||
'
|
||||
|
||||
cd "$D"
|
||||
|
||||
test_expect_success 'git pull -v -q' '
|
||||
mkdir clonedvq &&
|
||||
cd clonedvq &&
|
||||
git pull -v -q "$D/parent" >out 2>err &&
|
||||
test ! -s out
|
||||
(cd clonedvq && git init &&
|
||||
git pull -v -q "../parent" >out 2>err &&
|
||||
test ! -s out &&
|
||||
test ! -s err)
|
||||
'
|
||||
|
||||
cd "$D"
|
||||
|
||||
test_expect_success 'git pull -q -v' '
|
||||
mkdir clonedqv &&
|
||||
cd clonedqv &&
|
||||
git pull -q -v "$D/parent" >out 2>err &&
|
||||
test -s out
|
||||
(cd clonedqv && git init &&
|
||||
git pull -q -v "../parent" >out 2>err &&
|
||||
test ! -s out &&
|
||||
test -s err)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Loading…
Reference in New Issue
Block a user