t/lei*: check error messages on failures

[public-inbox.git] / t / solver_git.t

diff --git a/t/solver_git.t b/t/solver_git.t
index 13e478b325bcfa3b1c9f4613c99f4971f761461d..f5cc592c6a60822f641028c2c01df0718376c0ab 100644 (file)
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -43,6 +43,7 @@ test_lei({tmpdir => "$tmpdir/blob"}, sub {
        is($lei_out, $patch2->as_string, 'blob matches');
        ok(!lei('blob', '--mail', '69df7d5', '-I', $ibx->{inboxdir}),
                "--mail won't run solver");
+       like($lei_err, qr/\b69df7d5\b/, 'OID in error by git(1)');
 
        lei_ok('blob', '69df7d5', '-I', $ibx->{inboxdir});
        is(git_sha(1, \$lei_out)->hexdigest, $expect, 'blob contents output');
@@ -51,6 +52,8 @@ test_lei({tmpdir => "$tmpdir/blob"}, sub {
        is($lei_out, $prev, '--no-mail works');
        ok(!lei(qw(blob -I), $ibx->{inboxdir}, $non_existent),
                        'non-existent blob fails');
+       my $abbrev = substr($non_existent, 0, 7);
+       like($lei_err, qr/could not find $abbrev/, 'failed abbreviation noted');
        SKIP: {
                skip '/.git exists', 1 if -e '/.git';
                lei_ok(qw(-C / blob 69df7d5 -I), $ibx->{inboxdir},
@@ -59,9 +62,13 @@ test_lei({tmpdir => "$tmpdir/blob"}, sub {
 
                ok(!lei(qw(-C / blob --no-cwd 69df7d5 -I), $ibx->{inboxdir}),
                        '--no-cwd works');
+               like($lei_err, qr/no --git-dir to try/,
+                       'lack of --git-dir noted');
 
                ok(!lei(qw(-C / blob -I), $ibx->{inboxdir}, $non_existent),
                        'non-existent blob fails');
+               like($lei_err, qr/no --git-dir to try/,
+                       'lack of --git-dir noted');
        }
 
        # fallbacks
@@ -84,7 +91,7 @@ index 15ac20eb..771486c4
 @@ -1,13 +1,12 @@
  #!perl -w
 EOM
-       ok(index($lei_out, $exp) >= 0,
+       like($lei_out, qr/\Q$exp\E/,
                'preserve mode, regen header + context from -U0 patch');
        my $e = { GIT_DIR => "$ENV{HOME}/.local/share/lei/store/ALL.git" };
        my @x = xqx([qw(git cat-file --batch-all-objects --batch-check)], $e);