remote-bzr: simplify test checks

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras
2013-05-24 21:29:36 -05:00
committed by Junio C Hamano
parent 9f36d61e7b
commit 0067ecc82b

View File

@ -18,15 +18,8 @@ if ! python -c 'import bzrlib'; then
fi fi
check () { check () {
( echo $3 > expected &&
cd $1 && git --git-dir=$1/.git log --format='%s' -1 $2 > actual
git log --format='%s' -1 &&
git symbolic-ref HEAD
) > actual &&
(
echo $2 &&
echo "refs/heads/$3"
) > expected &&
test_cmp expected actual test_cmp expected actual
} }
@ -42,7 +35,7 @@ test_expect_success 'cloning' '
) && ) &&
git clone "bzr::bzrrepo" gitrepo && git clone "bzr::bzrrepo" gitrepo &&
check gitrepo one master check gitrepo HEAD one
' '
test_expect_success 'pulling' ' test_expect_success 'pulling' '
@ -54,7 +47,7 @@ test_expect_success 'pulling' '
(cd gitrepo && git pull) && (cd gitrepo && git pull) &&
check gitrepo two master check gitrepo HEAD two
' '
test_expect_success 'pushing' ' test_expect_success 'pushing' '
@ -89,7 +82,7 @@ test_expect_success 'roundtrip' '
(cd gitrepo && git pull && git push) && (cd gitrepo && git pull && git push) &&
check gitrepo four master && check gitrepo HEAD four &&
( (
cd gitrepo && cd gitrepo &&