adapt request-pull tests for new pull request format

10eb0007 (request-pull: avoid mentioning that the start point is a
single commit, 2010-01-29), changed the pull request format, so the
test needs some changes to still pass:

 - tolerate a missing blank line between “in the git repository at:”
   and the name of repository and branch

 - recognize subject and date in the new request format

 - update the expected request template to match the new format

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-04-24 07:29:52 -05:00 committed by Junio C Hamano
parent ea0edad58f
commit f2cabf6abf

View file

@ -69,8 +69,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '
#!/bin/sed -nf
/ in the git repository at:$/! d
n
/^$/! q
n
/^$/ n
s/^[ ]*\(.*\) \([^ ]*\)/please pull\
\1\
\2/p
@ -81,7 +80,9 @@ test_expect_success 'setup: two scripts for reading pull requests' '
#!/bin/sed -nf
s/$_x40/OBJECT_NAME/g
s/A U Thor/AUTHOR/g
s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
s/ [^ ].*/ SUBJECT/g
s/ [^ ].* (DATE)/ SUBJECT (DATE)/g
s/$downstream_url_for_sed/URL/g
s/for-upstream/BRANCH/g
s/mnemonic.txt/FILENAME/g
@ -188,11 +189,10 @@ test_expect_success 'pull request format' '
git init --bare downstream.git &&
cat <<-\EOT >expect &&
The following changes since commit OBJECT_NAME:
AUTHOR (1):
SUBJECT
SUBJECT (DATE)
are available in the git repository at:
URL BRANCH
SHORTLOG