From: Jeff King Date: Sun, 15 Sep 2024 11:31:15 +0000 (-0400) Subject: t9001: use a more distinct fake BugID X-Git-Tag: v2.47.0-rc0~15^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83799f1500768ade2452a07b08cf64a5fa46afde;p=thirdparty%2Fgit.git t9001: use a more distinct fake BugID In the test "cc list is sanitized", we feed a commit with a variety of trailers to send-email, and then check its output to see how it handled them. For most of them, we are grepping for a specific mention of the header, but there's a "BugID" header which we expect to be ignored. We confirm this by grepping for "12345", the fake BugID, and making sure it is not present. But we can be fooled by false positives! I just tracked down a flaky test failure here that was caused by matching this unrelated line in the output: <20240914090449.612345-1-author@example.com> which will change from run to run based on the time, pid, etc. Ideally we'd tighten the regex to make this more specifically, but since the point is that it _shouldn't_ be mentioned, it's hard to say what the right match would be (e.g., would there be a leading space?). Instead, let's just choose a match that is much less likely to appear. The actual content of the header isn't important, since it's supposed to be ignored. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 64a4ab3736..b1e31e7384 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1324,7 +1324,7 @@ test_expect_success $PREREQ 'cc list is sanitized' ' Reviewed-by: Füñný Nâmé Reported-by: bugger on Jira Reported-by: Douglas Reporter [from Jira profile] - BugID: 12345 + BugID: 12345should-not-appear Co-developed-by: "C. O. Developer" Signed-off-by: A. U. Thor EOF @@ -1337,7 +1337,7 @@ test_expect_success $PREREQ 'cc list is sanitized' ' " " actual-show-all-headers && test_grep "^(body) Ignoring Reported-by .* bugger on Jira" actual-show-all-headers && test_grep "^(body) Adding cc: Douglas Reporter " actual-show-all-headers && - test_grep ! "12345" actual-show-all-headers && + test_grep ! "12345should-not-appear" actual-show-all-headers && test_grep "^(body) Adding cc: \"C. O. Developer\" " actual-show-all-headers && test_grep "^(body) Adding cc: \"A. U. Thor\" " actual-show-all-headers '