X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=00b08e0367d5adcb4431a16e0b43c41f3eb721d8;hb=4db4bfa2c9178b315d2ac09cff794a4476ba1f6e;hp=4a42c016538bebc6d1efe5184cfbdd611dbe004c;hpb=fad9acd35e56a289ade90a62d056b2a6663d448c;p=public-inbox.git

diff --git a/t/v2writable.t b/t/v2writable.t
index 4a42c016..00b08e03 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -36,6 +36,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 +77,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', '<a-mid@b>');
 	$mime->body_set('different');
@@ -82,7 +91,8 @@ if ('ensure git configs are correct') {
 	@warn = ();
 	$mime->header_set('Message-Id', '<a-mid@b>');
 	$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>");
@@ -213,20 +223,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 $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);