t9700: loosen ident timezone regex
A few of the perl tests in t9700 ask for the author and committer ident, and then make sure we get something sensible. For the timestamp portion, we just match [0-9]+, because the actual value will depend on when the test is run. However, we do require that the timezone be "+0000". This works reliably because we set $TZ in test-lib.sh. But in preparation for changing the default timezone, let's be a bit more flexible. We don't actually care about the exact value here, just that we were able to get a sensible output from the perl module's access methods. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jul 9, 2020 at 16:35 UTC
fccf41e35aed528b7257a4e966437ccd92672bb1
1 file changed
+3
-3
t/t9700/test.pl
+3
-3
@@ -59,15 +59,15 @@ ok($@, "config_bool: non-boolean values fail");
59
open STDERR, ">&", $tmpstderr or die "cannot restore STDERR";
60
61
# ident
62
-like($r->ident("aUthor"), qr/^A U Thor <author\@example.com> [0-9]+ \+0000$/,
62
+like($r->ident("aUthor"), qr/^A U Thor <author\@example.com> [0-9]+ [+-]\d{4}$/,
63
"ident scalar: author (type)");
64
-like($r->ident("cOmmitter"), qr/^C O Mitter <committer\@example.com> [0-9]+ \+0000$/,
64
+like($r->ident("cOmmitter"), qr/^C O Mitter <committer\@example.com> [0-9]+ [+-]\d{4}$/,
65
"ident scalar: committer (type)");
66
is($r->ident("invalid"), "invalid", "ident scalar: invalid ident string (no parsing)");
67
my ($name, $email, $time_tz) = $r->ident('author');
68
is_deeply([$name, $email], ["A U Thor", "author\@example.com"],
69
"ident array: author");
70
-like($time_tz, qr/[0-9]+ \+0000/, "ident array: author");
70
+like($time_tz, qr/[0-9]+ [+-]\d{4}/, "ident array: author");
71
is_deeply([$r->ident("Name <email> 123 +0000")], ["Name", "email", "123 +0000"],
72
"ident array: ident string");
73
is_deeply([$r->ident("invalid")], [], "ident array: invalid ident string");