From b70f048bc3ba08b62b9841d185549466f66ef714 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sun, 20 May 2018 16:45:00 +0200 Subject: Add package base name in request close notifications Mention both the package base name and the request type in the subject of request closure notification. Implements FS#41607. Signed-off-by: Lukas Fleischer --- test/t1200-git-serve.sh | 2 +- test/t2500-notify.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/t1200-git-serve.sh b/test/t1200-git-serve.sh index 94a5ff61..473065fc 100755 --- a/test/t1200-git-serve.sh +++ b/test/t1200-git-serve.sh @@ -376,7 +376,7 @@ test_expect_success "Check whether package requests are closed when disowning." SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=user AUR_PRIVILEGED=0 \ "$GIT_SERVE" 2>&1 && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Orphan Request for foobar Accepted EOD grep "^Subject.*PRQ" sendmail.out >sendmail.parts && test_cmp sendmail.parts expected && diff --git a/test/t2500-notify.sh b/test/t2500-notify.sh index 46c2753e..b2bad1c8 100755 --- a/test/t2500-notify.sh +++ b/test/t2500-notify.sh @@ -304,7 +304,7 @@ test_expect_success 'Test subject and body of request close notifications.' ' "$NOTIFY" request-close 1 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && @@ -322,7 +322,7 @@ test_expect_success 'Test subject and body of request close notifications (auto- "$NOTIFY" request-close 0 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && @@ -342,7 +342,7 @@ test_expect_success 'Test subject and body of request close notifications with c "$NOTIFY" request-close 1 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && -- cgit v1.2.3-24-g4f1b