t/v2writable: use simplify permissions reading

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

diff --git a/t/v2writable.t b/t/v2writable.t
index 6cabf0d575b1eac0a22d0549e0792dad7b578054..7abb14f63b10b56f6b7e4e44b1088951322e7882 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -43,13 +43,9 @@ if ('ensure git configs are correct') {
                qw(core.sharedRepository 0644));
        is(system(@cmd), 0, "set sharedRepository in all.git");
        $git0 = PublicInbox::Git->new("$mainrepo/git/0.git");
-       my $fh = $git0->popen(qw(config core.sharedRepository));
-       my $v = eval { local $/; <$fh> };
-       chomp $v;
+       chomp(my $v = $git0->qx(qw(config core.sharedRepository)));
        is($v, '0644', 'child repo inherited core.sharedRepository');
-       $fh = $git0->popen(qw(config --bool repack.writeBitmaps));
-       $v = eval { local $/; <$fh> };
-       chomp $v;
+       chomp($v = $git0->qx(qw(config --bool repack.writeBitmaps)));
        is($v, 'true', 'child repo inherited repack.writeBitmaps');
 }
 
@@ -79,8 +75,8 @@ if ('ensure git configs are correct') {
        ok($im->add($mime), 'reused mid ok');
        like(join(' ', @warn), qr/reused/, 'warned about reused MID');
        my @mids = $mime->header_obj->header_raw('Message-Id');
-       is($mids[1], '<a-mid@b>', 'original mid not changed');
-       like($mids[0], $sane_mid, 'new MID added');
+       is($mids[0], '<a-mid@b>', 'original mid not changed');
+       like($mids[1], $sane_mid, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
@@ -95,8 +91,8 @@ if ('ensure git configs are correct') {
        ok($im->add($mime), 'random MID made');
        like(join(' ', @warn), qr/using random/, 'warned about using random');
        @mids = $mime->header_obj->header_raw('Message-Id');
-       is($mids[1], '<a-mid@b>', 'original mid not changed');
-       like($mids[0], $sane_mid, 'new MID added');
+       is($mids[0], '<a-mid@b>', 'original mid not changed');
+       like($mids[1], $sane_mid, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
@@ -231,4 +227,11 @@ EOF
        ok(!$@, '->done is idempotent');
 }
 
+{
+       ok($im->add($mime), 'add message to be purged');
+       local $SIG{__WARN__} = sub {};
+       ok($im->purge($mime), 'purged message');
+       $im->done;
+}
+
 done_testing();