[PATCH] adapt request-pull tests for new pull request format
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Apr 24, 2010, 12:29 UTC
- Message-ID
- <20100424122952.GA14196@progeny.tock>
- In-Reply-To
- <20100424121151.GA12312@progeny.tock>
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> --- t/t5150-request-pull.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh index 4c7f48a..b31b828 100644 --- a/t/t5150-request-pull.sh +++ b/t/t5150-request-pull.sh @@ -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 - are available in the git repository at: + SUBJECT (DATE) + are available in the git repository at: URL BRANCH SHORTLOG
-- 1.7.1.rc1