[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-236-gf614d53
? sunnavy
sunnavy at bestpractical.com
Mon Nov 1 04:45:13 EDT 2010
The branch, 3.9-trunk has been updated
via f614d53ea8069bb88a3e8e7a0b3c2d617982b784 (commit)
from a35c225c2fa8965aaefd5a542377d5ba75bfd52b (commit)
Summary of changes:
lib/RT/Test/GnuPG.pm | 59 +++++++++++++++++++++++++++++-
t/mail/gnupg-outgoing-encrypted.t | 50 +-------------------------
t/mail/gnupg-outgoing-plain.t | 51 +-------------------------
t/mail/gnupg-outgoing-signed.t | 50 +-------------------------
t/mail/gnupg-outgoing-signed_encrypted.t | 50 +-------------------------
5 files changed, 62 insertions(+), 198 deletions(-)
- Log -----------------------------------------------------------------
commit f614d53ea8069bb88a3e8e7a0b3c2d617982b784
Author: sunnavy <sunnavy at bestpractical.com>
Date: Mon Nov 1 16:45:03 2010 +0800
abstract create_and_test_outgoing_emails from t/mail/gnupg-outgoing*
diff --git a/lib/RT/Test/GnuPG.pm b/lib/RT/Test/GnuPG.pm
index cd1bb72..da78bbd 100644
--- a/lib/RT/Test/GnuPG.pm
+++ b/lib/RT/Test/GnuPG.pm
@@ -7,7 +7,9 @@ use RT::Crypt::GnuPG;
our @EXPORT =
qw(create_a_ticket update_ticket cleanup_headers set_queue_crypt_options
- check_text_emails send_email_and_check_transaction);
+ check_text_emails send_email_and_check_transaction
+ create_and_test_outgoing_emails
+ );
sub import {
my $class = shift;
@@ -241,3 +243,58 @@ sub send_email_and_check_transaction {
die "unknown type: $type";
}
}
+
+sub create_and_test_outgoing_emails {
+ my $queue = shift;
+ my $m = shift;
+ my @variants =
+ ( {}, { Sign => 1 }, { Encrypt => 1 }, { Sign => 1, Encrypt => 1 }, );
+
+ # collect emails
+ my %mail;
+
+ # create a ticket for each combination
+ foreach my $ticket_set (@variants) {
+ create_a_ticket( $queue, \%mail, $m, %$ticket_set );
+ }
+
+ my $tid;
+ {
+ my $ticket = RT::Ticket->new( RT->SystemUser );
+ ($tid) = $ticket->Create(
+ Subject => 'test',
+ Queue => $queue->id,
+ Requestor => 'rt-test at example.com',
+ );
+ ok $tid, 'ticket created';
+ }
+
+ # again for each combination add a reply message
+ foreach my $ticket_set (@variants) {
+ update_ticket( $tid, \%mail, $m, %$ticket_set );
+ }
+
+# ------------------------------------------------------------------------------
+# now delete all keys from the keyring and put back secret/pub pair for rt-test@
+# and only public key for rt-recipient@ so we can verify signatures and decrypt
+# like we are on another side recieve emails
+# ------------------------------------------------------------------------------
+
+ unlink $_
+ foreach glob( RT->Config->Get('GnuPGOptions')->{'homedir'} . "/*" );
+ RT::Test->import_gnupg_key( 'rt-recipient at example.com', 'public' );
+ RT::Test->import_gnupg_key('rt-test at example.com');
+
+ $queue = RT::Test->load_or_create_queue(
+ Name => 'Regression',
+ CorrespondAddress => 'rt-test at example.com',
+ CommentAddress => 'rt-test at example.com',
+ );
+ ok $queue && $queue->id, 'changed props of the queue';
+
+ for my $type ( keys %mail ) {
+ for my $mail ( map cleanup_headers($_), @{ $mail{$type} } ) {
+ send_email_and_check_transaction( $mail, $type );
+ }
+ }
+}
diff --git a/t/mail/gnupg-outgoing-encrypted.t b/t/mail/gnupg-outgoing-encrypted.t
index 2aed058..668c3a2 100644
--- a/t/mail/gnupg-outgoing-encrypted.t
+++ b/t/mail/gnupg-outgoing-encrypted.t
@@ -23,53 +23,5 @@ ok $queue && $queue->id, 'loaded or created queue';
my ( $baseurl, $m ) = RT::Test->started_ok;
ok $m->login, 'logged in';
-my @variants =
- ( {}, { Sign => 1 }, { Encrypt => 1 }, { Sign => 1, Encrypt => 1 }, );
-
-# collect emails
-my %mail;
-
-# create a ticket for each combination
-foreach my $ticket_set (@variants) {
- create_a_ticket( $queue, \%mail, $m, %$ticket_set );
-}
-
-my $tid;
-{
- my $ticket = RT::Ticket->new( RT->SystemUser );
- ($tid) = $ticket->Create(
- Subject => 'test',
- Queue => $queue->id,
- Requestor => 'rt-test at example.com',
- );
- ok $tid, 'ticket created';
-}
-
-# again for each combination add a reply message
-foreach my $ticket_set (@variants) {
- update_ticket( $tid, \%mail, $m, %$ticket_set );
-}
-
-# ------------------------------------------------------------------------------
-# now delete all keys from the keyring and put back secret/pub pair for rt-test@
-# and only public key for rt-recipient@ so we can verify signatures and decrypt
-# like we are on another side recieve emails
-# ------------------------------------------------------------------------------
-
-unlink $_ foreach glob( RT->Config->Get('GnuPGOptions')->{'homedir'} . "/*" );
-RT::Test->import_gnupg_key( 'rt-recipient at example.com', 'public' );
-RT::Test->import_gnupg_key('rt-test at example.com');
-
-$queue = RT::Test->load_or_create_queue(
- Name => 'Regression',
- CorrespondAddress => 'rt-test at example.com',
- CommentAddress => 'rt-test at example.com',
-);
-ok $queue && $queue->id, 'changed props of the queue';
-
-for my $type ( keys %mail ) {
- for my $mail ( map cleanup_headers($_), @{ $mail{$type} } ) {
- send_email_and_check_transaction( $mail, $type );
- }
-}
+create_and_test_outgoing_emails( $queue, $m );
diff --git a/t/mail/gnupg-outgoing-plain.t b/t/mail/gnupg-outgoing-plain.t
index 92b9316..05ed171 100644
--- a/t/mail/gnupg-outgoing-plain.t
+++ b/t/mail/gnupg-outgoing-plain.t
@@ -22,53 +22,4 @@ ok $queue && $queue->id, 'loaded or created queue';
my ( $baseurl, $m ) = RT::Test->started_ok;
ok $m->login, 'logged in';
-my @variants =
- ( {}, { Sign => 1 }, { Encrypt => 1 }, { Sign => 1, Encrypt => 1 }, );
-
-# collect emails
-my %mail;
-
-# create a ticket for each combination
-foreach my $ticket_set (@variants) {
- create_a_ticket( $queue, \%mail, $m, %$ticket_set );
-}
-
-my $tid;
-{
- my $ticket = RT::Ticket->new( RT->SystemUser );
- ($tid) = $ticket->Create(
- Subject => 'test',
- Queue => $queue->id,
- Requestor => 'rt-test at example.com',
- );
- ok $tid, 'ticket created';
-}
-
-# again for each combination add a reply message
-foreach my $ticket_set (@variants) {
- update_ticket( $tid, \%mail, $m, %$ticket_set );
-}
-
-# ------------------------------------------------------------------------------
-# now delete all keys from the keyring and put back secret/pub pair for rt-test@
-# and only public key for rt-recipient@ so we can verify signatures and decrypt
-# like we are on another side recieve emails
-# ------------------------------------------------------------------------------
-
-unlink $_ foreach glob( RT->Config->Get('GnuPGOptions')->{'homedir'} . "/*" );
-RT::Test->import_gnupg_key( 'rt-recipient at example.com', 'public' );
-RT::Test->import_gnupg_key('rt-test at example.com');
-
-$queue = RT::Test->load_or_create_queue(
- Name => 'Regression',
- CorrespondAddress => 'rt-test at example.com',
- CommentAddress => 'rt-test at example.com',
-);
-ok $queue && $queue->id, 'changed props of the queue';
-
-for my $type ( keys %mail ) {
- for my $mail ( map cleanup_headers($_), @{ $mail{$type} } ) {
- send_email_and_check_transaction( $mail, $type );
- }
-}
-
+create_and_test_outgoing_emails( $queue, $m );
diff --git a/t/mail/gnupg-outgoing-signed.t b/t/mail/gnupg-outgoing-signed.t
index 626a73b..df5d2fc 100644
--- a/t/mail/gnupg-outgoing-signed.t
+++ b/t/mail/gnupg-outgoing-signed.t
@@ -23,53 +23,5 @@ ok $queue && $queue->id, 'loaded or created queue';
my ( $baseurl, $m ) = RT::Test->started_ok;
ok $m->login, 'logged in';
-my @variants =
- ( {}, { Sign => 1 }, { Encrypt => 1 }, { Sign => 1, Encrypt => 1 }, );
-
-# collect emails
-my %mail;
-
-# create a ticket for each combination
-foreach my $ticket_set (@variants) {
- create_a_ticket( $queue, \%mail, $m, %$ticket_set );
-}
-
-my $tid;
-{
- my $ticket = RT::Ticket->new( RT->SystemUser );
- ($tid) = $ticket->Create(
- Subject => 'test',
- Queue => $queue->id,
- Requestor => 'rt-test at example.com',
- );
- ok $tid, 'ticket created';
-}
-
-# again for each combination add a reply message
-foreach my $ticket_set (@variants) {
- update_ticket( $tid, \%mail, $m, %$ticket_set );
-}
-
-# ------------------------------------------------------------------------------
-# now delete all keys from the keyring and put back secret/pub pair for rt-test@
-# and only public key for rt-recipient@ so we can verify signatures and decrypt
-# like we are on another side recieve emails
-# ------------------------------------------------------------------------------
-
-unlink $_ foreach glob( RT->Config->Get('GnuPGOptions')->{'homedir'} . "/*" );
-RT::Test->import_gnupg_key( 'rt-recipient at example.com', 'public' );
-RT::Test->import_gnupg_key('rt-test at example.com');
-
-$queue = RT::Test->load_or_create_queue(
- Name => 'Regression',
- CorrespondAddress => 'rt-test at example.com',
- CommentAddress => 'rt-test at example.com',
-);
-ok $queue && $queue->id, 'changed props of the queue';
-
-for my $type ( keys %mail ) {
- for my $mail ( map cleanup_headers($_), @{ $mail{$type} } ) {
- send_email_and_check_transaction( $mail, $type );
- }
-}
+create_and_test_outgoing_emails( $queue, $m );
diff --git a/t/mail/gnupg-outgoing-signed_encrypted.t b/t/mail/gnupg-outgoing-signed_encrypted.t
index 4ca7981..9f1a73b 100644
--- a/t/mail/gnupg-outgoing-signed_encrypted.t
+++ b/t/mail/gnupg-outgoing-signed_encrypted.t
@@ -24,53 +24,5 @@ ok $queue && $queue->id, 'loaded or created queue';
my ( $baseurl, $m ) = RT::Test->started_ok;
ok $m->login, 'logged in';
-my @variants =
- ( {}, { Sign => 1 }, { Encrypt => 1 }, { Sign => 1, Encrypt => 1 }, );
-
-# collect emails
-my %mail;
-
-# create a ticket for each combination
-foreach my $ticket_set (@variants) {
- create_a_ticket( $queue, \%mail, $m, %$ticket_set );
-}
-
-my $tid;
-{
- my $ticket = RT::Ticket->new( RT->SystemUser );
- ($tid) = $ticket->Create(
- Subject => 'test',
- Queue => $queue->id,
- Requestor => 'rt-test at example.com',
- );
- ok $tid, 'ticket created';
-}
-
-# again for each combination add a reply message
-foreach my $ticket_set (@variants) {
- update_ticket( $tid, \%mail, $m, %$ticket_set );
-}
-
-# ------------------------------------------------------------------------------
-# now delete all keys from the keyring and put back secret/pub pair for rt-test@
-# and only public key for rt-recipient@ so we can verify signatures and decrypt
-# like we are on another side recieve emails
-# ------------------------------------------------------------------------------
-
-unlink $_ foreach glob( RT->Config->Get('GnuPGOptions')->{'homedir'} . "/*" );
-RT::Test->import_gnupg_key( 'rt-recipient at example.com', 'public' );
-RT::Test->import_gnupg_key('rt-test at example.com');
-
-$queue = RT::Test->load_or_create_queue(
- Name => 'Regression',
- CorrespondAddress => 'rt-test at example.com',
- CommentAddress => 'rt-test at example.com',
-);
-ok $queue && $queue->id, 'changed props of the queue';
-
-for my $type ( keys %mail ) {
- for my $mail ( map cleanup_headers($_), @{ $mail{$type} } ) {
- send_email_and_check_transaction( $mail, $type );
- }
-}
+create_and_test_outgoing_emails( $queue, $m );
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list