diff options
| -rw-r--r-- | test/setup.sh | 14 | ||||
| -rwxr-xr-x | test/t2200-tuvotereminder.sh | 11 |
2 files changed, 15 insertions, 10 deletions
diff --git a/test/setup.sh b/test/setup.sh index e379adad..cd424791 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -15,6 +15,7 @@ MKPKGLISTS="$TOPLEVEL/scripts/mkpkglists.py" TUVOTEREMINDER="$TOPLEVEL/scripts/tuvotereminder.py" PKGMAINT="$TOPLEVEL/scripts/pkgmaint.py" AURBLUP="$TOPLEVEL/scripts/aurblup.py" +NOTIFY="$TOPLEVEL/scripts/notify.py" # Create the configuration file and a dummy notification script. cat >config <<-EOF @@ -23,11 +24,16 @@ backend = sqlite name = aur.db [options] +aur_location = https://aur.archlinux.org +aur_request_ml = aur-requests@archlinux.org enable-maintenance = 0 maintenance-exceptions = 127.0.0.1 [notifications] -notify-cmd = ./notify.sh +notify-cmd = $NOTIFY +sendmail = ./sendmail.sh +sender = notify@aur.archlinux.org +reply-to = noreply@aur.archlinux.org [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 @@ -55,11 +61,11 @@ packagesfile = packages.gz pkgbasefile = pkgbase.gz EOF -cat >notify.sh <<-\EOF +cat >sendmail.sh <<-\EOF #!/bin/sh -echo $* >>notify.out +cat >>sendmail.out EOF -chmod +x notify.sh +chmod +x sendmail.sh cat >git-shell.sh <<-\EOF #!/bin/sh diff --git a/test/t2200-tuvotereminder.sh b/test/t2200-tuvotereminder.sh index 438c0c34..8477c92b 100755 --- a/test/t2200-tuvotereminder.sh +++ b/test/t2200-tuvotereminder.sh @@ -14,13 +14,12 @@ test_expect_success 'Test Trusted User vote reminders.' ' INSERT INTO TU_VoteInfo (ID, Agenda, User, Submitted, End, Quorum, SubmitterID) VALUES (3, "Lorem ipsum.", "user", 0, $tomorrow, 0.00, 2); INSERT INTO TU_VoteInfo (ID, Agenda, User, Submitted, End, Quorum, SubmitterID) VALUES (4, "Lorem ipsum.", "user", 0, $threedays, 0.00, 2); EOD - >notify.out && + >sendmail.out && "$TUVOTEREMINDER" && - cat <<-EOD >expected && - tu-vote-reminder 2 - tu-vote-reminder 3 - EOD - test_cmp notify.out expected + grep -q "Proposal 2" sendmail.out && + grep -q "Proposal 3" sendmail.out && + test_must_fail grep -q "Proposal 1" sendmail.out && + test_must_fail grep -q "Proposal 4" sendmail.out ' test_done |