X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=t%2F06_mail_handling.t;h=9489af01a3d8407ecc81a141ae6ff26511ab9eb0;hb=04d8d896dabc0b9314127a704b6f285a9fe54ecc;hp=b188a99e407a616c29075f96f4197be287d03430;hpb=5e18dc96bf01d38542c7efddfec990dbe83fdca4;p=debbugs.git diff --git a/t/06_mail_handling.t b/t/06_mail_handling.t index b188a99..9489af0 100644 --- a/t/06_mail_handling.t +++ b/t/06_mail_handling.t @@ -1,7 +1,7 @@ # -*- mode: cperl;-*- # $Id: 05_mail.t,v 1.1 2005/08/17 21:46:17 don Exp $ -use Test::More tests => 72; +use Test::More tests => 126; use warnings; use strict; @@ -22,6 +22,7 @@ use File::Basename qw(dirname basename); use lib qw(t/lib); use DebbugsTest qw(:all); use Data::Dumper; +use Encode qw(decode encode); # HTTP::Server:::Simple defines a SIG{CHLD} handler that breaks system; undef it here. $SIG{CHLD} = sub {}; @@ -70,10 +71,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 +93,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 +110,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'); @@ -120,11 +126,22 @@ ok($status->{severity} eq 'wishlist','bug 1 wishlisted'); # now we're going to go through and methododically test all of the control commands. my @control_commands = - (severity_wishlist => {command => 'severity', + ( + severity_wishlist => {command => 'severity', value => 'wishlist', status_key => 'severity', status_value => 'wishlist', }, + reassign_bar_baz => {command => 'reassign', + value => 'bar,baz', + status_key => 'package', + status_value => 'bar,baz', + }, + reassign_foo => {command => 'reassign', + value => 'foo', + status_key => 'package', + status_value => 'foo', + }, 'found_1.0' => {command => 'found', value => '1.0', status_key => 'found_versions', @@ -191,11 +208,52 @@ my @control_commands = status_key => 'owner', status_value => 'foo@bar.com', }, + owner_replyto => {command => 'owner', + value => '!', + status_key => 'owner', + status_value => 'foo@bugs.something', + }, noowner => {command => 'noowner', value => '', status_key => 'owner', status_value => '', }, + clone => {command => 'clone', + value => '-1', + status_key => 'package', + status_value => 'foo', + bug => '2', + }, + merge => {command => 'merge', + value => '1 2', + status_key => 'mergedwith', + status_value => '2', + }, + unmerge => {command => 'unmerge', + value => '', + status_key => 'mergedwith', + status_value => '', + }, + forcemerge => {command => 'forcemerge', + value => '2', + status_key => 'mergedwith', + status_value => '2', + }, + unmerge => {command => 'unmerge', + value => '', + status_key => 'mergedwith', + status_value => '', + }, + block => {command => 'block', + value => ' with 2', + status_key => 'blockedby', + status_value => '2', + }, + unblock => {command => 'unblock', + value => ' with 2', + status_key => 'blockedby', + status_value => '', + }, summary => {command => 'summary', value => '5', status_key => 'summary', @@ -206,6 +264,26 @@ my @control_commands = status_key => 'summary', status_value => '', }, + outlook => {command => 'outlook', + value => '5', + status_key => 'outlook', + status_value => 'This is a silly bug', + }, + nooutlook => {command => 'outlook', + value => '', + status_key => 'outlook', + status_value => '', + }, + affects => {command => 'affects', + value => 'foo', + status_key => 'affects', + status_value => 'foo', + }, + noaffects => {command => 'affects', + value => '', + status_key => 'affects', + status_value => '', + }, close => {command => 'close', value => '', status_key => 'done', @@ -222,6 +300,26 @@ my @control_commands = status_key => 'owner', status_value => '', }, + tag => {command => 'tag', + value => ' = patch', + status_key => 'keywords', + status_value => 'patch', + }, + untag => {command => 'tag', + value => ' - patch', + status_key => 'keywords', + status_value => '', + }, + plustag => {command => 'tag', + value => ' + patch', + status_key => 'keywords', + status_value => 'patch', + }, + utf8_retitle => {command => 'retitle', + value => 'Thïs is a ütff8 title [♥♡☙☎]', + status_key => 'subject', + status_value => decode("utf8",'Thïs is a ütff8 title [♥♡☙☎]'), + }, ); # In order for the archive/unarchive to work, we have to munge the summary file slightly @@ -243,18 +341,24 @@ $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"); # now we need to check to make sure that the control message actually did anything my $status; - $status = read_bug(bug=>1, + $status = read_bug(exists $control_command->{bug}?(bug => $control_command->{bug}):(bug=>1), exists $control_command->{location}?(location => $control_command->{location}):(), ); - is_deeply($status->{$control_command->{status_key}},$control_command->{status_value},"bug 1 $command") + is_deeply($status->{$control_command->{status_key}}, + $control_command->{status_value}, + "bug " . + (exists $control_command->{bug}?$control_command->{bug}:1). + " $command" + ) or fail(Dumper($status)); } @@ -266,15 +370,17 @@ send_message(to => 'control@bugs.something', Subject => "Munging a bug with unarchivearchive", ], body => <<'EOF') or fail 'message to control@bugs.something failed'; +debug 10 archive 1 unarchive 1 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");