]> Sergey Matveev's repositories - public-inbox.git/commitdiff
t/solver_git.t: avoid redundant work for snapshot test
authorEric Wong <e@80x24.org>
Sun, 1 Jan 2023 10:54:40 +0000 (10:54 +0000)
committerEric Wong <e@80x24.org>
Sun, 1 Jan 2023 21:25:18 +0000 (21:25 +0000)
We only have to generate the expected tarball and checksum once
for testing both -httpd and generic PSGI. And drop the redundant
length check since the SHA-256 check is sufficient.

This saves 20-30ms on my system.

t/solver_git.t

index d8942747f2106e082735b1ec9bdb2ad2761c34c0..8222203162489fb5082aa4792644915f166c0dfe 100644 (file)
@@ -263,6 +263,16 @@ SKIP: {
        cgiturl = http://example.com/binfoo
 EOF
        close $cfgfh or die;
+       my $exp_digest;
+       {
+               my $exp = xqx([qw(git archive --format=tar.gz
+                               --prefix=public-inbox-1.0.0/ v1.0.0)],
+                               { GIT_DIR => $git_dir });
+               is($?, 0, 'no error from git archive');
+               ok(length($exp) > 1024, 'expected archive generated');
+               $exp_digest = git_sha(256, \$exp)->hexdigest;
+       };
+
        my $cfg = PublicInbox::Config->new($cfgpath);
        my $www = PublicInbox::WWW->new($cfg);
        my $client = sub {
@@ -341,14 +351,11 @@ EOF
                is($res->header('Content-Disposition'),
                        qq'inline; filename="$fn"', 'c-d header');
                is($res->header('ETag'), qq'"$v1_0_0_rev"', 'etag header');
-               my $exp = xqx([qw(git archive --format=tar.gz
-                               --prefix=public-inbox-1.0.0/ v1.0.0)],
-                               { GIT_DIR => $git_dir });
+
                my $got = $res->content;
-               is(length($got), length($exp),
-                       "length matches installed `git archive' output") and
-               is(git_sha(1, \$got)->hexdigest, git_sha(1, \$exp)->hexdigest,
+               is(git_sha(256, \$got)->hexdigest, $exp_digest,
                        "content matches installed `git archive' output");
+               undef $got;
 
                $fn = 'public-inbox-1.0.2.tar.gz';
                $res = $cb->(GET("/public-inbox/snapshot/$fn"));