unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH v2 3/4] t/v2writable: test ENOSPC from fast-import
Date: Fri, 26 Jul 2024 21:31:10 +0000	[thread overview]
Message-ID: <20240726214311.4092940-4-e@80x24.org> (raw)
In-Reply-To: <20240726214311.4092940-1-e@80x24.org>

This also ensures we can recover after the ENOSPC condition
is resolved.
---
 t/v2writable.t | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/t/v2writable.t b/t/v2writable.t
index a062d1b3..0493f90e 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -9,6 +9,7 @@ use PublicInbox::TestCommon;
 use PublicInbox::Spawn qw(popen_rd);
 use Config;
 use Cwd qw(abs_path);
+use autodie qw(kill open read);
 require_git(2.6);
 require_mods(qw(DBD::SQLite Xapian));
 local $ENV{HOME} = abs_path('t');
@@ -340,15 +341,46 @@ ok($@, 'V2Writable fails on non-existent dir');
 SKIP: {
 	my $strace = strace_inject;
 	my $eml = eml_load 't/plack-qp.eml';
+	my $gfi_err = "$inboxdir/gfi.err";
 	open my $fh, '>', my $trace = "$inboxdir/trace.out";
 	my $rd = popen_rd([ $strace, '-p', $$, '-o', $trace,
 		'-e', 'inject=pwrite64:error=ENOSPC'], undef, { 2 => 1 });
 	$rd->poll_in(10) or die 'strace not ready';
-	ok ! eval { $im->add($eml) }, 'v2w->add fails on ENOSPC';
-	like $@, qr/ disk is full/, 'set $@ for ENOSPC';
+	ok ! eval {
+		open my $olderr, '>&', \*STDERR;
+		open STDERR, '>>', $gfi_err;
+		$im->add($eml);
+		open STDERR, '>&', $olderr;
+	}, 'v2w->add fails on ENOSPC';
+	like $@, qr/ disk is full/, '$@ reports ENOSPC';
 	$im->done;
 	kill 'TERM', $rd->attached_pid;
 	$rd->close;
+
+	$im->add($eml) or xbail 'cannot add message to start fast-import';
+	my $pid = $im->{im}->{io}->attached_pid or xbail 'no import pid';
+	open $fh, '>', $trace;
+
+	$rd = popen_rd([$strace, '-p', $pid, '-o', $trace,
+		'-e', 'inject=write:error=ENOSPC:when=1'],
+		undef, { 2 => 1 });
+	$rd->poll_in(10) or die 'strace not ready';
+	ok !eval { $im->done }, 'done fails with ENOSPC';
+	ok $@, '$@ set on ENOSPC';
+	kill 'TERM', $rd->attached_pid;
+
+	open $fh, '<', $gfi_err;
+	read $fh, my $errbuf, -s $fh;
+	like $errbuf, qr/fatal:/, 'fatal git error noted';
+	open $fh, '>', $gfi_err;
+
+	$rd->close;
+
+	$im->add($eml) or xbail '->add fails after fixing ENOSPC';
+	$im->done;
+	ok !$im->add($eml), '->add detects existing message';
+	$im->done;
+	is -s $fh, 0, 'nothing new in fast-import stderr';
 }
 
 done_testing;

  parent reply	other threads:[~2024-07-26 21:43 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-23 21:28 [PATCH 0/4] fix ENOSPC on writes Eric Wong
2024-07-23 21:28 ` [PATCH 1/4] t/msgmap: updates for Perl 5.12+ and copyrights Eric Wong
2024-07-23 21:28 ` [PATCH 2/4] msgmap: mid_insert: reraise on unexpected errors Eric Wong
2024-07-24  7:22   ` [PATCH 2/4] msgmap: mid_insert: reraise on unexpected errors, [PATCH 3/4] t/v2writable: test ENOSPC from fast-import Štěpán Němec
2024-07-25  0:38     ` Eric Wong
2024-07-25  6:42       ` Štěpán Němec
2024-07-23 21:28 ` Eric Wong
2024-07-23 21:28 ` [PATCH 4/4] t/v2writable: use 5.10.1 and autodie more Eric Wong
2024-07-26 21:31 ` [PATCH v2 0/4] fix ENOSPC on writes Eric Wong
2024-07-26 21:31   ` [PATCH v2 1/4] t/msgmap: updates for Perl 5.12+ and copyrights Eric Wong
2024-07-26 21:31   ` [PATCH v2 2/4] msgmap: mid_insert: reraise on unexpected errors Eric Wong
2024-07-26 21:31   ` Eric Wong [this message]
2024-07-26 21:31   ` [PATCH v2 4/4] t/v2writable: use 5.10.1 and autodie more Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240726214311.4092940-4-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).