Commit Diff

Commit:
32fdf3fddec1fabda12ee185d866d1db180cfe7d
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
use GOT_NOTIFY_TIMEOUT for both notification helpers Fixes timeout setting used by http notification helper during tests.
Actions:
Patch | Tree
commit - d63901c24a5fd0343f35bab89971bd373bf6748c
commit + 32fdf3fddec1fabda12ee185d866d1db180cfe7d
blob - b56c9e29023eb5b5864d19e6dd778741a94a26aa
blob + f6b5c3d5bb9950c89a3971f1a96f632167735b70
--- gotd/libexec/got-notify-email/got-notify-email.c
+++ gotd/libexec/got-notify-email/got-notify-email.c
@@ -432,7 +432,7 @@ main(int argc, char *argv[])
 		usage();
 
 	/* used by the regression test suite */
-	timeoutstr = getenv("GOT_NOTIFY_EMAIL_TIMEOUT");
+	timeoutstr = getenv("GOT_NOTIFY_TIMEOUT");
 	if (timeoutstr) {
 		smtp_timeout = strtonum(timeoutstr, 0, 600, &errstr);
 		if (errstr != NULL)
blob - 5d5cb64c2cfe872004aaf1f81e0c56045252bf6c
blob + 7ee57e3154cb19e45a1600bb2184b336e5ea684e
--- regress/gotd/Makefile
+++ regress/gotd/Makefile
@@ -48,7 +48,7 @@ GOTD_START_CMD?=env ${GOTD_ENV} $(BINDIR)/gotd -vv -f 
 GOTD_STOP_CMD?=$(BINDIR)/gotctl -f $(GOTD_SOCK) stop
 GOTD_TRAP=trap "$(GOTD_STOP_CMD)" HUP INT QUIT PIPE TERM
 
-GOTD_ENV=GOT_NOTIFY_EMAIL_TIMEOUT=1
+GOTD_ENV=GOT_NOTIFY_TIMEOUT=1
 
 GOTD_TEST_ENV=GOTD_TEST_ROOT=$(GOTD_TEST_ROOT) \
 	GOTD_TEST_REPO_URL=$(GOTD_TEST_REPO_URL) \