* Remove getmaintainers from Debbugs::CGI

[debbugs.git] / t / lib / DebbugsTest.pm

diff --git a/t/lib/DebbugsTest.pm b/t/lib/DebbugsTest.pm
index 9f5f8e6a900c72a6fed841348d87d11a473b5dce..a2e0537d7336480d31f89edda01c72b9e859e9aa 100644 (file)
--- a/t/lib/DebbugsTest.pm
+++ b/t/lib/DebbugsTest.pm
@@ -29,6 +29,8 @@ use File::Temp qw(tempdir);
 use Cwd qw(getcwd);
 use Debbugs::MIME qw(create_mime_message);
 use File::Basename qw(dirname basename);
+use IPC::Open3;
+use IO::Handle;
 
 use Params::Validate qw(validate_with :types);
 
@@ -85,6 +87,7 @@ END
                            "$config_dir/indices/sources" => <<END,
 foo main foo
 END
+                           "$config_dir/pseudo-packages.description" => '',
                           );
      while (my ($file,$contents) = each %files_to_create) {
          system('mkdir','-p',dirname($file));
@@ -142,12 +145,32 @@ sub send_message{
                                         }
                              );
      $ENV{LOCAL_PART} = $param{to};
-     my $receive = new IO::File ('|scripts/receive.in') or die "Unable to start receive.in: $!";
-
-     print {$receive} create_mime_message($param{headers},
-                                         $param{body}) or die "Unable to to print to receive.in";
-     close($receive) or die "Unable to close receive.in";
-     $? == 0 or die "receive.in failed";
+     my ($rfd,$wfd);
+     my $output='';
+     local $SIG{PIPE} = 'IGNORE';
+     local $SIG{CHLD} = sub {};
+     my $pid = open3($wfd,$rfd,$rfd,'scripts/receive.in')
+         or die "Unable to start receive.in: $!";
+     print {$wfd} create_mime_message($param{headers},
+                                        $param{body}) or die "Unable to to print to receive.in";
+     close($wfd) or die "Unable to close receive.in";
+     my $err = $? >> 8;
+     my $childpid = waitpid($pid,0);
+     if ($childpid != -1) {
+         $err = $? >> 8;
+         print STDERR "receive.in pid: $pid doesn't match childpid: $childpid\n" if $childpid != $pid;
+     }
+     if ($err != 0 ) {
+         my $rfh =  IO::Handle->new_from_fd($rfd,'r') or die "Unable to create filehandle: $!";
+         $rfh->blocking(0);
+         my $rv;
+         while ($rv = $rfh->sysread($output,1000,length($output))) {}
+         if (not defined $rv) {
+              print STDERR "Reading from STDOUT/STDERR would have blocked.";
+         }
+         print STDERR $output,qq(\n);
+         die "receive.in failed with exit status $err";
+     }
      # now we should run processall to see if the message gets processed
      if ($param{run_processall}) {
          system('scripts/processall.in') == 0 or die "processall.in failed";
@@ -181,6 +204,8 @@ sub send_message{
          return 0 if not defined $pid;
          if ($pid) {
               $child_pid = $pid;
+              # Wait here for a second to let the child start up
+              sleep 1;
               return $pid;
          }
          else {