abstract out mail checking to avoid code duplication; add limit test

diff --git a/t/06_mail_handling.t b/t/06_mail_handling.t
index dc863bc4ccc1273c019a3e7186b8b07e2809f0e2..1c6709420d8af4644d5c100777d5ddb2f643ee6f 100644 (file)
--- a/t/06_mail_handling.t
+++ b/t/06_mail_handling.t
@@ -70,10 +70,13 @@ ok(-e "$spool_dir/db-h/01/1.report",'report file created');
 # sent out. 1) ack to submitter 2) mail to maintainer
 
 # This keeps track of the previous size of the sendmail directory
-my $SD_SIZE_PREV = 0;
-my $SD_SIZE_NOW = dirsize($sendmail_dir);
-ok($SD_SIZE_NOW-$SD_SIZE_PREV >= 2,'submit messages appear to have been sent out properly');
-$SD_SIZE_PREV=$SD_SIZE_NOW;
+my $SD_SIZE = 0;
+$SD_SIZE =
+    num_messages_sent($SD_SIZE,2,
+                     $sendmail_dir,
+                     'submit messages appear to have been sent out properly',
+                    );
+
 
 # now send a message to the bug
 
@@ -89,9 +92,10 @@ Severity: normal
 This is a silly bug
 EOF
 
-$SD_SIZE_NOW = dirsize($sendmail_dir);
-ok($SD_SIZE_NOW-$SD_SIZE_PREV >= 2,'1@bugs.something messages appear to have been sent out properly');
-$SD_SIZE_PREV=$SD_SIZE_NOW;
+$SD_SIZE =
+    num_messages_sent($SD_SIZE,2,
+                     $sendmail_dir,
+                     '1@bugs.something messages appear to have been sent out properly');
 
 # just check to see that control doesn't explode
 send_message(to => 'control@bugs.something',
@@ -105,9 +109,10 @@ retitle 1 new title
 thanks
 EOF
 
-$SD_SIZE_NOW = dirsize($sendmail_dir);
-ok($SD_SIZE_NOW-$SD_SIZE_PREV >= 1,'control@bugs.something messages appear to have been sent out properly');
-$SD_SIZE_PREV=$SD_SIZE_NOW;
+$SD_SIZE =
+   num_messages_sent($SD_SIZE,1,
+                    $sendmail_dir,
+                    'control@bugs.something messages appear to have been sent out properly');
 # now we need to check to make sure the control message was processed without errors
 ok(system('sh','-c','find '.$sendmail_dir.q( -type f | xargs grep -q "Subject: Processed: Munging a bug")) == 0,
    'control@bugs.something message was parsed without errors');
@@ -295,9 +300,10 @@ $control_command->{command} 1$control_command->{value}
 thanks
 EOF
                                  ;
-     $SD_SIZE_NOW = dirsize($sendmail_dir);
-     ok($SD_SIZE_NOW-$SD_SIZE_PREV >= 1,'control@bugs.something messages appear to have been sent out properly');
-     $SD_SIZE_PREV=$SD_SIZE_NOW;
+     $SD_SIZE =
+        num_messages_sent($SD_SIZE,1,
+                          $sendmail_dir,
+                          'control@bugs.something messages appear to have been sent out properly');
      # now we need to check to make sure the control message was processed without errors
      ok(system('sh','-c','find '.$sendmail_dir.q( -type f | xargs grep -q "Subject: Processed: Munging a bug with $command")) == 0,
        'control@bugs.something'. "$command message was parsed without errors");
@@ -330,9 +336,10 @@ submitter 1 bar@baz.com
 thanks
 EOF
                                  ;
-$SD_SIZE_NOW = dirsize($sendmail_dir);
-ok($SD_SIZE_NOW-$SD_SIZE_PREV >= 1,'control@bugs.something messages appear to have been sent out properly');
-$SD_SIZE_PREV=$SD_SIZE_NOW;
+$SD_SIZE =
+    num_messages_sent($SD_SIZE,1,
+                     $sendmail_dir,
+                     'control@bugs.something messages appear to have been sent out properly');
 # now we need to check to make sure the control message was processed without errors
 ok(system('sh','-c','find '.$sendmail_dir.q( -type f | xargs grep -q "Subject: Processed: Munging a bug with unarchivearchive")) == 0,
    'control@bugs.something'. "unarchive/archive message was parsed without errors");

diff --git a/t/07_control_limit.t b/t/07_control_limit.t
new file mode 100644 (file)
index 0000000..630cc8d
--- /dev/null
+++ b/t/07_control_limit.t
@@ -0,0 +1,104 @@
+# -*- mode: cperl; -*-
+
+use Test::More tests => 4;
+
+use warnings;
+use strict;
+
+# Here, we're going to shoot messages through a set of things that can
+# happen.
+
+# First, we're going to send mesages to receive.
+# To do so, we'll first send a message to submit,
+# then send messages to the newly created bugnumber.
+
+use IO::File;
+use File::Temp qw(tempdir);
+use Cwd qw(getcwd);
+use Debbugs::MIME qw(create_mime_message);
+use File::Basename qw(dirname basename);
+# The test functions are placed here to make things easier
+use lib qw(t/lib);
+use DebbugsTest qw(:all);
+use Data::Dumper;
+
+# HTTP::Server:::Simple defines a SIG{CHLD} handler that breaks system; undef it here.
+$SIG{CHLD} = sub {};
+my %config;
+eval {
+     %config = create_debbugs_configuration(debug => exists $ENV{DEBUG}?$ENV{DEBUG}:0);
+};
+if ($@) {
+     BAIL_OUT($@);
+}
+
+my $sendmail_dir = $config{sendmail_dir};
+my $spool_dir = $config{spool_dir};
+my $config_dir = $config{config_dir};
+
+END{
+     if ($ENV{DEBUG}) {
+         diag("spool_dir:   $spool_dir\n");
+         diag("config_dir:   $config_dir\n");
+         diag("sendmail_dir: $sendmail_dir\n");
+     }
+}
+
+# We're going to use create mime message to create these messages, and
+# then just send them to receive.
+
+send_message(to=>'submit@bugs.something',
+            headers => [To   => 'submit@bugs.something',
+                        From => 'foo@bugs.something',
+                        Subject => 'Submiting a bug',
+                       ],
+            body => <<EOF) or fail('Unable to send message');
+Package: foo
+Severity: normal
+
+This is a silly bug
+EOF
+
+my $SD_SIZE = dirsize($sendmail_dir);
+send_message(to => 'control@bugs.something',
+            headers => [To   => 'control@bugs.something',
+                        From => 'foo@bugs.something',
+                        Subject => "Munging a bug with limit_package_bar",
+                       ],
+            body => <<EOF) or fail 'message to control@bugs.something failed';
+debug 10
+limit package bar
+severity 1 wishlist
+thanks
+EOF
+
+$SD_SIZE =
+    num_messages_sent($SD_SIZE,1,
+                          $sendmail_dir,
+                     'control@bugs.something messages appear to have been sent out properly');
+
+# make sure this fails
+ok(system('sh','-c','find '.$sendmail_dir.q( -type f | xargs grep -q "Subject: Processed (with 1 errors): Munging a bug with limit_package_bar")) == 0,
+   'control@bugs.something'. "limit message failed with 1 error");
+
+send_message(to => 'control@bugs.something',
+            headers => [To   => 'control@bugs.something',
+                        From => 'foo@bugs.something',
+                        Subject => "Munging a bug with limit_package_foo",
+                       ],
+            body => <<EOF) or fail 'message to control@bugs.something failed';
+debug 10
+limit package foo
+severity 1 wishlist
+thanks
+EOF
+
+$SD_SIZE =
+    num_messages_sent($SD_SIZE,1,
+                          $sendmail_dir,
+                     'control@bugs.something messages appear to have been sent out properly');
+
+# make sure this fails
+ok(system('sh','-c','find '.$sendmail_dir.q( -type f | xargs grep -q "Subject: Processed: Munging a bug with limit_package_foo")) == 0,
+   'control@bugs.something'. "limit message succeeded with no errors");
+

diff --git a/t/lib/DebbugsTest.pm b/t/lib/DebbugsTest.pm
index 39a791c79f923bd4c4c91bde438d11758621ca8c..f203668c7c1af29385c9c6a7e51bfffa0a57d0ca 100644 (file)
--- a/t/lib/DebbugsTest.pm
+++ b/t/lib/DebbugsTest.pm
@@ -31,6 +31,7 @@ use Debbugs::MIME qw(create_mime_message);
 use File::Basename qw(dirname basename);
 use IPC::Open3;
 use IO::Handle;
+use Test::More;
 
 use Params::Validate qw(validate_with :types);
 
@@ -40,9 +41,10 @@ BEGIN{
 
      @EXPORT = ();
      %EXPORT_TAGS = (configuration => [qw(dirsize create_debbugs_configuration send_message)],
+                    mail          => [qw(num_messages_sent)],
                    );
      @EXPORT_OK = ();
-     Exporter::export_ok_tags(qw(configuration));
+     Exporter::export_ok_tags(qw(configuration mail));
      $EXPORT_TAGS{all} = [@EXPORT_OK];
 }
 
@@ -230,6 +232,25 @@ sub send_message{
      }
 }
 
+=head2 num_messages_sent
+
+     $SD_SIZE = num_messages_sent($SD_SIZE,2,$sendmail_dir,'2 messages have been sent properly');
+
+Tests to make sure that at least a certain number of messages have
+been sent since the last time this command was run. Usefull to test to
+make sure that mail has been sent.
+
+=cut
+
+sub num_messages_sent {
+    my ($prev_size,$num_messages,$sendmail_dir,$test_name) = @_;
+    my $cur_size = dirsize($sendmail_dir);
+    ## print STDERR "sendmail: $sendmail_dir, want: $num_messages,
+    ## size: $cur_size, prev_size: $prev_size\n";
+    ok($cur_size-$prev_size >= $num_messages, $test_name);
+    return $cur_size;
+}
+
 
 1;