t9700: make hash size independent
The Perl test script for t9700 was matching on exactly 40 hex characters. With SHA-256, we'll have 64 hex-character object IDs. Create a variable with a regex which matches exactly 40 or 64 hex characters and use that to match the output. Note that both of the uses of this can be anchored, which makes the code simpler, so do that as well. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Jul 29, 2020 at 23:14 UTC
e0a646ed4fd7ae0c3320f7fa56d6a7d6bbaa8142
1 file changed
+4
-2
t/t9700/test.pl
+4
-2
@@ -23,6 +23,8 @@ sub adjust_dirsep {
23
return $path;
24
}
25
26
+my $oid_re = qr/^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})?$/;
27
+
28
BEGIN { use_ok('Git') }
29
30
# set up
@@ -93,7 +95,7 @@ is(Git::hash_object("blob", $tmpfile), $file1hash, "hash_object: roundtrip");
95
open TEMPFILE, ">$tmpfile" or die "Can't open $tmpfile: $!";
96
print TEMPFILE my $test_text = "test blob, to be inserted\n";
97
close TEMPFILE or die "Failed writing to $tmpfile: $!";
96
-like(our $newhash = $r->hash_and_insert_object($tmpfile), qr/[0-9a-fA-F]{40}/,
98
+like(our $newhash = $r->hash_and_insert_object($tmpfile), $oid_re,
99
"hash_and_insert_object: returns hash");
100
open TEMPFILE, "+>$tmpfile" or die "Can't open $tmpfile: $!";
101
is($r->cat_blob($newhash, \*TEMPFILE), length $test_text, "cat_blob: roundtrip size");
@@ -119,7 +121,7 @@ is($r2->wc_subdir, "directory2/", "wc_subdir initial (2)");
121
122
# commands in sub directory
123
my $last_commit = $r2->command_oneline(qw(rev-parse --verify HEAD));
122
-like($last_commit, qr/^[0-9a-fA-F]{40}$/, 'rev-parse returned hash');
124
+like($last_commit, $oid_re, 'rev-parse returned hash');
125
my $dir_commit = $r2->command_oneline('log', '-n1', '--pretty=format:%H', '.');
126
isnt($last_commit, $dir_commit, 'log . does not show last commit');
127