From 9d197b8e58243e39b995ee7aa99e398f356b926c Mon Sep 17 00:00:00 2001
From: Ricardo Signes <rjbs@cpan.org>
Date: Sun, 28 Apr 2019 15:00:43 +0100
Subject: [PATCH 1/2] indexer tests: use the new meta_munger to create bogus
 metadata

---
 corpus/Provides-NoFile-0.50.tar.gz | Bin 1092 -> 0 bytes
 t/mldistwatch-big.t                |  19 +++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
 delete mode 100644 corpus/Provides-NoFile-0.50.tar.gz

diff --git a/corpus/Provides-NoFile-0.50.tar.gz b/corpus/Provides-NoFile-0.50.tar.gz
deleted file mode 100644
index e38eb57212786e42c7ef1bcac0b6a5905dc34cdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1092
zcmV-K1iSkmiwFP!jm2C51MOM=kJ>gAzn}eAc-bUc=?G59mnpY)qc<vDRX7H0Q#DP<
z1Ow@XggVZ(*AxBQ`)mksTn=<=%Cs&Y>ExXK;`id`_wgs8!{h5<#FA<|ei?+UN_3ml
zPKpH~#I<d#TE|r_F|B300ygTFW7LULcWq1z%QndgwhN9U7il6Whfw(2VY1H-%*NwA
z<E!UbxBn4z^77wmv@c#Zd;NlZz<M~AwI~0MndRRiwgdUM9m_buq#*x$@juUhmTJ_Z
zS8NPBK<~UpqDDwHis!mOt!BTWzfIz3d37@j|LurN6p7sW7sZ|ckKljHAco|B*Ro3f
zKL+yozt~bg#Q&~i@0|Y*AtnDG1=VU5(P1Ju^@WEk6i+y#0!QpU9tDZ0AexG4%sqs0
z6<1nsdi`ei;u8OqUH#(EX{3j-Ps8UGG)#kVG~n!A8gQ0)_;!ItHxZo${=ko;aWL^P
zK@%1+P6ZnchBx5yywhlVUW*CpdFOF-&A4D3Lz4t?giYPBVKWd+qY>`DdeN((Fz{KF
zFb~fe577*6tR{2j%Meo@dUz_t+^f}Q@hF82twPe1IORSY$9%%{hzYgB)m_zVL$~y)
zn1yir$|(c|ofQOugO{BOLG#uB(qA^_dCNiBzMnGA<RHfKJoWIWJj1Q=Fc{Xd@!E1&
zpU;%RIv_*0(Iz@sq!sjGkT4$5F!)FX^bdyAzhcp7XGz~QTCdluNpxcTSV3F)&#iwM
zQGt8xG5lXAuGD{~?Uww14CM3wMhh0<;}HLwuCvL%Ezf_)a@>;tkAXB{xcNc+E`kuq
zNhV(Y@iT<}<bhz>PIv-z^y@{h-)^*;_}O!;?d%)v6b#g$#I`}kc*^3BX18~7*<M=6
zt)_Y#FM9oM<Ge3>@1H=@qSI}5o4*Y@EopL#p=WW5o}Qt@&sSnU9@c;IrLPzt2kPH2
zEpwy)th%g!qh2rT{}{NHIz!78poTs8XQu*HjY78)g3{tIrA?q~zZ}%0+26~X@2WsK
z30V$oi$Uf6k#cYq+)5MPiB8JHfxR8YS}RJs+sqC`qw>7cjR~XNpX%yCKrhzhG^5!6
zc{{M4oZ~c`U=^I2#8mzkOMg;8s@^=dgaA1x#dnDcW|4I*4etbak4j+-Ym%1L<oWth
zJKY2ZMj#-yRakjbu7#^|yqP>o!w@gF9*MJ%(S!}497L+Z)ZlWsex~iUSQ9+f9?+`F
z>{ag)7PiybO0wx%gbWBQ=Az{IuZjot|9VG#xsONaf5#*i@V`s!^85c$a5(>KM)}7+
z4(WelyLa<%65FxL^Zyu_0};~+yZ3?O48<wOKV*Xa88*(4Q3~#F4i9|)&wl?Y#K+<K
zH+Fvia}29||33=8|4w~Hm7f9nED<1ZW6rRE%S66wL&?WiPmJ<ayF`f+B}$a|mhc%?
K%6M%6C;$K(Ni_rj

diff --git a/t/mldistwatch-big.t b/t/mldistwatch-big.t
index c468d9cdb..71ffe330e 100644
--- a/t/mldistwatch-big.t
+++ b/t/mldistwatch-big.t
@@ -286,12 +286,19 @@ subtest "case mismatch, authorized for original, desc. version" => sub {
 subtest "sometimes, provides fields are empty" => sub {
   my $pause = PAUSE::TestPAUSE->init_new;
 
-  # Key points:
-  #   1. dist version 0.50
-  #   2. meta provides has...
-  #     a. package Provides::NoFile in a named file with version 1.5
-  #     b. package Provides::NoFile::Nowhere with an undef file entry
-  $pause->upload_author_file(MYSTERIO => 'corpus/Provides-NoFile-0.50.tar.gz');
+  $pause->upload_author_fake(
+    MYSTERIO => 'Provides-NoFile-0.50.tar.gz',
+    {
+      meta_munger => sub {
+        $_[0]{provides} = {
+          "Provides::NoFile" => { file => "lib/Provides/NoFile.pm", version => "1.5" },
+          "Provides::NoFile::Nowhere" => { file => undef },
+        };
+
+        return $_[0];
+      },
+    }
+  );
 
   my $result = $pause->test_reindex;
 

From f4ef74f5757f51f8460e0274d09fcf00a3add1cf Mon Sep 17 00:00:00 2001
From: Ricardo Signes <rjbs@cpan.org>
Date: Tue, 30 Apr 2019 07:33:22 -0400
Subject: [PATCH 2/2] TestPAUSE: add a means to force rewrite_indexes

---
 t/lib/PAUSE/TestPAUSE.pm | 46 +++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/t/lib/PAUSE/TestPAUSE.pm b/t/lib/PAUSE/TestPAUSE.pm
index e423f6bff..031894b42 100644
--- a/t/lib/PAUSE/TestPAUSE.pm
+++ b/t/lib/PAUSE/TestPAUSE.pm
@@ -313,9 +313,8 @@ sub with_our_config {
   $code->($self);
 }
 
-sub test_reindex {
-  my ($self, $arg) = @_;
-  $arg //= {};
+sub _take_pause_action {
+  my ($self, $action) = @_;
 
   $self->with_our_config(sub {
     my $self = shift;
@@ -349,18 +348,7 @@ sub test_reindex {
 
     die "stray mail in test mail trap before reindex" if @stray_mail;
 
-    if ($arg->{pick}) {
-      my $dbh = PAUSE::dbh();
-      $dbh->do("DELETE FROM distmtimes WHERE dist = ?", undef, $_)
-        for @{ $arg->{pick} };
-    }
-
-    PAUSE::mldistwatch->new({
-      sleep => 0,
-      ($arg->{pick} ? (pick => $arg->{pick}) : ()),
-    })->reindex;
-
-    $arg->{after}->($self->tmpdir) if $arg->{after};
+    $action->();
 
     my @deliveries = Email::Sender::Simple->default_transport->deliveries;
 
@@ -376,6 +364,34 @@ sub test_reindex {
   });
 }
 
+sub rewrite_indexes {
+  my ($self) = @_;
+  my $action = sub {
+    PAUSE::mldistwatch->new({ sleep => 0 })->rewrite_indexes;
+  };
+
+  return $self->_take_pause_action($action);
+}
+
+sub test_reindex {
+  my ($self, $arg) = @_;
+  $arg //= {};
+  my $action = sub {
+    if ($arg->{pick}) {
+      my $dbh = PAUSE::dbh();
+      $dbh->do("DELETE FROM distmtimes WHERE dist = ?", undef, $_)
+        for @{ $arg->{pick} };
+    }
+
+    PAUSE::mldistwatch->new({
+      sleep => 0,
+      ($arg->{pick} ? (pick => $arg->{pick}) : ()),
+    })->reindex;
+  };
+
+  return $self->_take_pause_action($action);
+}
+
 has _file_index => (
   is      => 'ro',
   default => sub {  {}  },