X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=44156fe19ebf22cd7b9d886c2774a0614c5c6895;hb=50c822076abee76c3133ffc3482488392eecedfb;hp=ab85e9af86f73a1501a225b2950e3c5015237d44;hpb=79c5fdeacf75a2daeb57a7a5f00a170044e28634;p=public-inbox.git diff --git a/t/v2writable.t b/t/v2writable.t index ab85e9af..44156fe1 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -6,11 +6,14 @@ use Test::More; use PublicInbox::MIME; use PublicInbox::ContentId qw(content_digest); use File::Temp qw/tempdir/; +require './t/common.perl'; +require_git(2.6); foreach my $mod (qw(DBD::SQLite Search::Xapian)) { eval "require $mod"; plan skip_all => "$mod missing for nntpd.t" if $@; } use_ok 'PublicInbox::V2Writable'; +umask 007; my $mainrepo = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $ibx = { mainrepo => $mainrepo, @@ -36,6 +39,15 @@ my $im = eval { }; is($im->{partitions}, 1, 'one partition when forced'); ok($im->add($mime), 'ordinary message added'); +foreach my $f ("$mainrepo/msgmap.sqlite3", + glob("$mainrepo/xap*/*"), + glob("$mainrepo/xap*/*/*")) { + my @st = stat($f); + my ($bn) = (split(m!/!, $f))[-1]; + is($st[2] & 07777, -f _ ? 0660 : 0770, + "default sharedRepository respected for $bn"); +} + my $git0; if ('ensure git configs are correct') { @@ -68,7 +80,7 @@ if ('ensure git configs are correct') { [ $sec->header_obj->header_raw('Message-Id') ], 'no new Message-Id added'); - my $sane_mid = qr/\A<[\w\-]+\@localhost>\z/; + my $sane_mid = qr/\A<[\w\-\.]+\@\w+>\z/; @warn = (); $mime->header_set('Message-Id', ''); $mime->body_set('different'); @@ -82,7 +94,8 @@ if ('ensure git configs are correct') { @warn = (); $mime->header_set('Message-Id', ''); $mime->body_set('this one needs a random mid'); - my $gen = PublicInbox::Import::digest2mid(content_digest($mime)); + my $hdr = $mime->header_obj; + my $gen = PublicInbox::Import::digest2mid(content_digest($mime), $hdr); unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id'); my $fake = PublicInbox::MIME->new($mime->as_string); $fake->header_set('Message-Id', "<$gen>"); @@ -108,18 +121,16 @@ if ('ensure git configs are correct') { $mime->header_set('References', ''); ok($im->add($mime), 'message with multiple Message-ID'); $im->done; - my @found; my $srch = $ibx->search; - $srch->reopen->each_smsg_by_mid('abcde@1', sub { push @found, @_; 1 }); - is(scalar(@found), 1, 'message found by first MID'); - $srch->reopen->each_smsg_by_mid('abcde@2', sub { push @found, @_; 1 }); - is(scalar(@found), 2, 'message found by second MID'); - is($found[0]->{doc_id}, $found[1]->{doc_id}, 'same document'); - ok($found[1]->{doc_id} > 0, 'doc_id is positive'); + my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 }); + is($mset1->size, 1, 'message found by first MID'); + my $mset2 = $srch->reopen->query('m:abcde@2', { mset => 1 }); + is($mset2->size, 1, 'message found by second MID'); + is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid, + 'same document') if ($mset1->size); } SKIP: { - use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD); use Net::NNTP; use IO::Socket; use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); @@ -151,27 +162,9 @@ EOF my $pid; my $len; END { kill 'TERM', $pid if defined $pid }; - $! = 0; - my $fl = fcntl($sock, F_GETFD, 0); - ok(! $!, 'no error from fcntl(F_GETFD)'); - is($fl, FD_CLOEXEC, 'cloexec set by default (Perl behavior)'); - $pid = fork; - if ($pid == 0) { - use POSIX qw(dup2); - $ENV{PI_CONFIG} = $pi_config; - # pretend to be systemd - fcntl($sock, F_SETFD, $fl &= ~FD_CLOEXEC); - dup2(fileno($sock), 3) or die "dup2 failed: $!\n"; - $ENV{LISTEN_PID} = $$; - $ENV{LISTEN_FDS} = 1; - my $nntpd = 'blib/script/public-inbox-nntpd'; - exec $nntpd, "--stdout=$out", "--stderr=$err"; - die "FAIL: $!\n"; - } - ok(defined $pid, 'forked nntpd process successfully'); - $! = 0; - fcntl($sock, F_SETFD, $fl |= FD_CLOEXEC); - ok(! $!, 'no error from fcntl(F_SETFD)'); + my $nntpd = 'blib/script/public-inbox-nntpd'; + my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ]; + $pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [ $sock ]); my $host_port = $sock->sockhost . ':' . $sock->sockport; my $n = Net::NNTP->new($host_port); $n->group($group); @@ -214,21 +207,21 @@ EOF $im = PublicInbox::V2Writable->new($ibx, 1); is($im->{partitions}, 1, 'detected single partition from previous'); my $smsg = $im->remove($mime, 'test removal'); - my @after = $git0->qx(qw(log --pretty=oneline)); $im->done; + my @after = $git0->qx(qw(log --pretty=oneline)); my $tip = shift @after; like($tip, qr/\A[a-f0-9]+ test removal\n\z/s, 'commit message propagated to git'); is_deeply(\@after, \@before, 'only one commit written to git'); is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid'); - like($smsg->num, qr/\A\d+\z/, 'numeric number in return message'); - is($ibx->mm->mid_for($smsg->num), undef, 'no longer in Msgmap by num'); + my $num = $smsg->{num}; + like($num, qr/\A\d+\z/, 'numeric number in return message'); + is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num'); my $srch = $ibx->search->reopen; - my @found = (); - $srch->each_smsg_by_mid($smsg->mid, sub { push @found, @_; 1 }); - is(scalar(@found), 0, 'no longer found in Xapian'); + my $mset = $srch->query('m:'.$smsg->mid, { mset => 1}); + is($mset->size, 0, 'no longer found in Xapian'); my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames); - is($srch->{over_ro}->get_art($smsg->num), undef, + is($srch->{over_ro}->get_art($num), undef, 'removal propagated to Over DB'); my $after = $git0->qx(@log1);