[Rt-commit] r19494 - in rt/3.999/trunk: . lib/RT/Crypt lib/RT/Interface share/html/Admin/Elements share/html/Elements t t/mail t/web
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Thu May 7 03:00:11 EDT 2009
Author: sunnavy
Date: Thu May 7 03:00:11 2009
New Revision: 19494
Modified:
rt/3.999/trunk/ (props changed)
rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm
rt/3.999/trunk/lib/RT/I18N.pm
rt/3.999/trunk/lib/RT/Interface/Email.pm
rt/3.999/trunk/share/html/Admin/Elements/EditCustomFieldValuesSource
rt/3.999/trunk/share/html/Elements/MakeClicky
rt/3.999/trunk/t/clicky.t
rt/3.999/trunk/t/mail/crypt-gnupg.t
rt/3.999/trunk/t/mail/gnupg-bad.t
rt/3.999/trunk/t/mail/gnupg-incoming.t
rt/3.999/trunk/t/mail/gnupg-realmail.t
rt/3.999/trunk/t/mail/gnupg-reverification.t
rt/3.999/trunk/t/mail/sendmail.t
rt/3.999/trunk/t/rtname.t
rt/3.999/trunk/t/web/crypt-gnupg.t
rt/3.999/trunk/t/web/gnupg-outgoing.t
rt/3.999/trunk/t/web/gnupg-select-keys-on-create.t
rt/3.999/trunk/t/web/gnupg-select-keys-on-update.t
Log:
r20319 at sunnavys-mb (orig r18782): sunnavy | 2009-03-13 16:20:56 +0800
RT->config->get now returns arrayref or hashref or scalar. regex in config now is just string, we need to qr// to get a regex
Modified: rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm (original)
+++ rt/3.999/trunk/lib/RT/Crypt/GnuPG.pm Thu May 7 03:00:11 2009
@@ -435,7 +435,7 @@
);
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
# handling passphrase in GnuPGOptions
$args{'passphrase'} = delete $opt{'passphrase'}
@@ -624,7 +624,7 @@
return unless $args{'sign'} || $args{'encrypt'};
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
# handling passphrase in GnupGOptions
$args{'passphrase'} = delete $opt{'passphrase'}
@@ -716,7 +716,7 @@
return unless $args{'sign'} || $args{'encrypt'};
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
# handling passphrase in GnupGOptions
$args{'passphrase'} = delete $opt{'passphrase'}
@@ -821,7 +821,7 @@
return unless $args{'sign'} || $args{'encrypt'};
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
# handling passphrase in GnupGOptions
$args{'passphrase'} = delete $opt{'passphrase'}
@@ -1072,7 +1072,7 @@
my %args = ( data => undef, signature => undef, top => undef, @_ );
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
$opt{'digest-algo'} ||= 'SHA1';
$gnupg->options->hash_init( _prepare_gnupg_options(%opt), meta_interactive => 0, );
@@ -1119,7 +1119,7 @@
my %args = ( data => undef, signature => undef, top => undef, @_ );
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
$opt{'digest-algo'} ||= 'SHA1';
$gnupg->options->hash_init( _prepare_gnupg_options(%opt), meta_interactive => 0, );
@@ -1172,7 +1172,7 @@
);
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
# handling passphrase in GnupGOptions
$args{'passphrase'} = delete $opt{'passphrase'}
@@ -1249,7 +1249,7 @@
@_
);
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
# handling passphrase in GnuPGOptions
$args{'passphrase'} = delete $opt{'passphrase'}
@@ -1381,7 +1381,7 @@
);
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
# handling passphrase in GnuPGOptions
$args{'passphrase'} = delete $opt{'passphrase'}
@@ -1429,7 +1429,7 @@
);
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
# handling passphrase in GnuPGOptions
$args{'passphrase'} = delete $opt{'passphrase'}
@@ -2033,7 +2033,7 @@
}
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
$opt{'digest-algo'} ||= 'SHA1';
$opt{'with-colons'} = undef; # parseable format
@@ -2088,7 +2088,7 @@
sub parse_keys_info {
my @lines = @_;
- my %gpg_opt = RT->config->get('GnuPGOptions');
+ my %gpg_opt = %{RT->config->get('GnuPGOptions')};
my @res = ();
foreach my $line (@lines) {
@@ -2235,7 +2235,7 @@
my $key = shift;
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
$gnupg->options->hash_init( _prepare_gnupg_options(%opt), meta_interactive => 0, );
my ( $handles, $handle_list ) = _make_gpg_handles();
@@ -2285,7 +2285,7 @@
my $key = shift;
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
$gnupg->options->hash_init( _prepare_gnupg_options(%opt), meta_interactive => 0, );
my ( $handles, $handle_list ) = _make_gpg_handles();
@@ -2369,7 +2369,7 @@
sub probe {
my $gnupg = new GnuPG::Interface;
- my %opt = RT->config->get('GnuPGOptions');
+ my %opt = %{RT->config->get('GnuPGOptions')};
$gnupg->options->hash_init(
_prepare_gnupg_options(%opt),
armor => 1,
Modified: rt/3.999/trunk/lib/RT/I18N.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/I18N.pm (original)
+++ rt/3.999/trunk/lib/RT/I18N.pm Thu May 7 03:00:11 2009
@@ -361,7 +361,7 @@
return $fallback unless defined $_[0] && length $_[0];
my $charset;
- my @encodings = RT->config->get('EmailInputEncodings');
+ my @encodings = @{RT->config->get('EmailInputEncodings')};
if ( @encodings and eval { require Encode::Guess; 1 } ) {
Encode::Guess->set_suspects(@encodings);
my $decoder = Encode::Guess->guess( $_[0] );
@@ -376,7 +376,8 @@
return 'utf-8'
if $matched{'utf8'}; # one and only normalization
- foreach my $suspect ( RT->config->get('EmailInputEncodings') ) {
+ foreach my $suspect (
+ @{RT->config->get('EmailInputEncodings')} ) {
next unless $matched{$suspect};
Jifty->log->debug("Encode::Guess ambiguous ($decoder); using $suspect");
$charset = $suspect;
Modified: rt/3.999/trunk/lib/RT/Interface/Email.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Interface/Email.pm (original)
+++ rt/3.999/trunk/lib/RT/Interface/Email.pm Thu May 7 03:00:11 2009
@@ -459,7 +459,7 @@
$ENV{'PERL_MAILERS'} = RT->config->get('SendmailPath');
push @mailer_args, split( /\s+/, RT->config->get('SendmailArguments') );
} else {
- push @mailer_args, RT->config->get('MailParams');
+ push @mailer_args, @{RT->config->get('MailParams')};
}
unless ( $args{'entity'}->send(@mailer_args) ) {
@@ -999,8 +999,13 @@
my $subject = shift;
my $rtname = RT->config->get('rtname');
- my $test_name = RT->config->get('EmailsubjectTagRegex')
- || qr/\Q$rtname\E/i;
+ my $test_name = RT->config->get('EmailSubjectTagRegex');
+ if ($test_name) {
+ $test_name = qr/$test_name/;
+ }
+ else {
+ $test_name = qr/\Q$rtname\E/i;
+ }
my $id;
if ( $subject =~ s/\[$test_name\s+\#(\d+)\s*\]//i ) {
@@ -1035,6 +1040,7 @@
my $tag = $queue_tag || RT->config->get('rtname');
$tag_re = qr/\Q$tag\E/;
}
+
elsif ($queue_tag) {
$tag_re = qr/$tag_re|\Q$queue_tag\E/;
my $rtname = RT->config->get('rtname');
@@ -1150,7 +1156,7 @@
return ( 0, "Failed to parse this message. Something is likely badly wrong with the message" );
}
- my @mail_plugins = grep $_, RT->config->get('MailPlugins');
+ my @mail_plugins = grep $_, @{RT->config->get('MailPlugins')};
push @mail_plugins, "Auth::MailFrom" unless @mail_plugins;
@mail_plugins = _load_plugins(@mail_plugins);
Modified: rt/3.999/trunk/share/html/Admin/Elements/EditCustomFieldValuesSource
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Elements/EditCustomFieldValuesSource (original)
+++ rt/3.999/trunk/share/html/Admin/Elements/EditCustomFieldValuesSource Thu May 7 03:00:11 2009
@@ -57,7 +57,8 @@
return unless $custom_field->is_selection_type;
my @sources;
-foreach my $class( 'RT::Model::CustomFieldValueCollection', RT->config->get('CustomFieldValuesSources') ) {
+foreach my $class( 'RT::Model::CustomFieldValueCollection',
+@{RT->config->get('CustomFieldValuesSources')} ) {
next unless $class;
local $@;
Modified: rt/3.999/trunk/share/html/Elements/MakeClicky
==============================================================================
--- rt/3.999/trunk/share/html/Elements/MakeClicky (original)
+++ rt/3.999/trunk/share/html/Elements/MakeClicky Thu May 7 03:00:11 2009
@@ -107,7 +107,7 @@
# Filter
my %active;
-$active{$_}++ for RT->config->get('ActiveMakeClicky');
+$active{$_}++ for @{RT->config->get('ActiveMakeClicky')};
@types = grep $active{$_->{name}}, @types;
# Build up the whole match
Modified: rt/3.999/trunk/t/clicky.t
==============================================================================
--- rt/3.999/trunk/t/clicky.t (original)
+++ rt/3.999/trunk/t/clicky.t Thu May 7 03:00:11 2009
@@ -6,7 +6,7 @@
use RT::Test; use Test::More;
-my %clicky = map { $_ => 1 } grep $_, RT->config->get('ActiveMakeClicky');
+my %clicky = map { $_ => 1 } grep $_, @{RT->config->get('ActiveMakeClicky')};
if ( keys %clicky ) {
plan tests => 14;
} else {
Modified: rt/3.999/trunk/t/mail/crypt-gnupg.t
==============================================================================
--- rt/3.999/trunk/t/mail/crypt-gnupg.t (original)
+++ rt/3.999/trunk/t/mail/crypt-gnupg.t Thu May 7 03:00:11 2009
@@ -22,13 +22,20 @@
use_ok('RT::Crypt::GnuPG');
use_ok('MIME::Entity');
-RT->config->set( 'GnuPG',
- enable => 1,
- outgoing_messages_format => 'RFC' );
-
-RT->config->set( 'GnuPGOptions',
- homedir => $homedir,
- 'no-permission-warning' => undef,
+RT->config->set(
+ 'GnuPG',
+ {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
+);
+
+RT->config->set(
+ 'GnuPGOptions',
+ {
+ homedir => $homedir,
+ 'no-permission-warning' => undef,
+ },
);
Modified: rt/3.999/trunk/t/mail/gnupg-bad.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-bad.t (original)
+++ rt/3.999/trunk/t/mail/gnupg-bad.t Thu May 7 03:00:11 2009
@@ -17,16 +17,24 @@
my $homedir = RT::Test::get_abs_relocatable_dir(File::Spec->updir(),
qw(data gnupg keyrings));
-RT->config->set( 'GnuPG',
- enable => 1,
- outgoing_messages_format => 'RFC' );
-
-RT->config->set( 'GnuPGOptions',
- homedir => $homedir,
- passphrase => 'test',
- 'no-permission-warning' => undef);
+RT->config->set(
+ 'GnuPG',
+ {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
+);
+
+RT->config->set(
+ 'GnuPGOptions',
+ {
+ homedir => $homedir,
+ passphrase => 'test',
+ 'no-permission-warning' => undef,
+ }
+);
-RT->config->set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
+RT->config->set( 'MailPlugins' => ['Auth::MailFrom', 'Auth::GnuPG'] );
my ($baseurl, $m) = RT::Test->started_ok;
Modified: rt/3.999/trunk/t/mail/gnupg-incoming.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-incoming.t (original)
+++ rt/3.999/trunk/t/mail/gnupg-incoming.t Thu May 7 03:00:11 2009
@@ -23,15 +23,23 @@
RT::Test->set_mail_catcher;
-RT->config->set( 'GnuPG',
- enable => 1,
- outgoing_messages_format => 'RFC' );
-
-RT->config->set( 'GnuPGOptions',
- homedir => $homedir,
- 'no-permission-warning' => undef);
+RT->config->set(
+ 'GnuPG',
+ {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
+);
+
+RT->config->set(
+ 'GnuPGOptions',
+ {
+ homedir => $homedir,
+ 'no-permission-warning' => undef
+ }
+);
-RT->config->set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
+RT->config->set( 'MailPlugins' => ['Auth::MailFrom', 'Auth::GnuPG'] );
my ($baseurl, $m) = RT::Test->started_ok;
Modified: rt/3.999/trunk/t/mail/gnupg-realmail.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-realmail.t (original)
+++ rt/3.999/trunk/t/mail/gnupg-realmail.t Thu May 7 03:00:11 2009
@@ -18,16 +18,24 @@
use File::Temp qw(tempdir);
my $homedir = tempdir( CLEANUP => 1 );
-RT->config->set( 'GnuPG',
- enable => 1,
- outgoing_messages_format => 'RFC' );
-
-RT->config->set( 'GnuPGOptions',
- homedir => $homedir,
- passphrase => 'rt-test',
- 'no-permission-warning' => undef);
+RT->config->set(
+ 'GnuPG',
+ {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
+);
+
+RT->config->set(
+ 'GnuPGOptions',
+ {
+ homedir => $homedir,
+ passphrase => 'rt-test',
+ 'no-permission-warning' => undef,
+ }
+);
-RT->config->set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
+RT->config->set( 'MailPlugins' => ['Auth::MailFrom', 'Auth::GnuPG'] );
RT::Test->import_gnupg_key('rt-recipient at example.com');
RT::Test->import_gnupg_key('rt-test at example.com', 'public');
Modified: rt/3.999/trunk/t/mail/gnupg-reverification.t
==============================================================================
--- rt/3.999/trunk/t/mail/gnupg-reverification.t (original)
+++ rt/3.999/trunk/t/mail/gnupg-reverification.t Thu May 7 03:00:11 2009
@@ -16,16 +16,24 @@
use File::Temp qw(tempdir);
my $homedir = tempdir( CLEANUP => 1 );
-RT->config->set( 'GnuPG',
- enable => 1,
- outgoing_messages_format => 'RFC' );
-
-RT->config->set( 'GnuPGOptions',
- homedir => $homedir,
- passphrase => 'rt-test',
- 'no-permission-warning' => undef);
+RT->config->set(
+ 'GnuPG',
+ {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
+);
+
+RT->config->set(
+ 'GnuPGOptions',
+ {
+ homedir => $homedir,
+ passphrase => 'rt-test',
+ 'no-permission-warning' => undef,
+ }
+);
-RT->config->set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
+RT->config->set( 'MailPlugins' => ['Auth::MailFrom', 'Auth::GnuPG'] );
diag "load Everyone group" if $ENV{'TEST_VERBOSE'};
Modified: rt/3.999/trunk/t/mail/sendmail.t
==============================================================================
--- rt/3.999/trunk/t/mail/sendmail.t (original)
+++ rt/3.999/trunk/t/mail/sendmail.t Thu May 7 03:00:11 2009
@@ -338,7 +338,8 @@
# {{{ test a message containing a russian subject and NO content type
-RT->config->set( EmailInputEncodings => 'koi8-r', RT->config->get('EmailInputEncodings') );
+RT->config->set( EmailInputEncodings => ['koi8-r',
+ @{RT->config->get('EmailInputEncodings')}] );
RT->config->set( EmailOutputEncoding => 'koi8-r' );
my $russian_subject_email = RT::Test::get_relocatable_file(
'russian-subject-no-content-type', (File::Spec->updir(), 'data', 'emails'));
@@ -374,9 +375,9 @@
';
}
-my @input_encodings = RT->config->get('EmailInputEncodings');
+my @input_encodings = @{RT->config->get('EmailInputEncodings')};
shift @input_encodings;
-RT->config->set(EmailInputEncodings => @input_encodings );
+RT->config->set(EmailInputEncodings => [@input_encodings] );
RT->config->set(EmailOutputEncoding => 'utf-8');
# }}}
Modified: rt/3.999/trunk/t/rtname.t
==============================================================================
--- rt/3.999/trunk/t/rtname.t (original)
+++ rt/3.999/trunk/t/rtname.t Thu May 7 03:00:11 2009
@@ -8,26 +8,26 @@
# normal use case, regexp set to rtname
RT->config->set( rtname => "site" );
-RT->config->set( EmailsubjectTagRegex => qr/site/ );
+RT->config->set( EmailSubjectTagRegex => 'site' );
RT->config->set( rtname => undef );
is(RT::Interface::Email::parse_ticket_id("[site #123] test"), 123);
is(RT::Interface::Email::parse_ticket_id("[othersite #123] test"), undef);
# oops usecase, where the regexp is scragged
RT->config->set( rtname => "site" );
-RT->config->set( EmailsubjectTagRegex => undef );
+RT->config->set( EmailSubjectTagRegex => undef );
is(RT::Interface::Email::parse_ticket_id("[site #123] test"), 123);
is(RT::Interface::Email::parse_ticket_id("[othersite #123] test"), undef);
# set to a simple regexp. NOTE: we no longer match "site"
RT->config->set( rtname => "site");
-RT->config->set( EmailsubjectTagRegex => qr/newsite/);
+RT->config->set( EmailSubjectTagRegex => 'newsite');
is(RT::Interface::Email::parse_ticket_id("[site #123] test"), undef);
is(RT::Interface::Email::parse_ticket_id("[newsite #123] test"), 123);
# set to a more complex regexp
RT->config->set( rtname => "site" );
-RT->config->set( EmailsubjectTagRegex => qr/newsite|site/ );
+RT->config->set( EmailSubjectTagRegex => 'newsite|site' );
is(RT::Interface::Email::parse_ticket_id("[site #123] test"), 123);
is(RT::Interface::Email::parse_ticket_id("[newsite #123] test"), 123);
is(RT::Interface::Email::parse_ticket_id("[othersite #123] test"), undef);
Modified: rt/3.999/trunk/t/web/crypt-gnupg.t
==============================================================================
--- rt/3.999/trunk/t/web/crypt-gnupg.t (original)
+++ rt/3.999/trunk/t/web/crypt-gnupg.t Thu May 7 03:00:11 2009
@@ -34,16 +34,24 @@
my $homedir = tempdir( CLEANUP => 1 );
use_ok('RT::Crypt::GnuPG');
-RT->config->set( 'GnuPG',
- enable => 1,
- outgoing_messages_format => 'RFC' );
-
-RT->config->set( 'GnuPGOptions',
- homedir => $homedir,
- passphrase => 'recipient',
- 'no-permission-warning' => undef,
- 'trust-model' => 'always');
-RT->config->set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
+RT->config->set(
+ 'GnuPG',
+ {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
+);
+
+RT->config->set(
+ 'GnuPGOptions',
+ {
+ homedir => $homedir,
+ passphrase => 'recipient',
+ 'no-permission-warning' => undef,
+ 'trust-model' => 'always',
+ }
+);
+RT->config->set( 'MailPlugins' => ['Auth::MailFrom', 'Auth::GnuPG'] );
RT::Test->import_gnupg_key('recipient at example.com', 'public');
RT::Test->import_gnupg_key('recipient at example.com', 'secret');
RT::Test->import_gnupg_key('general at example.com', 'public');
Modified: rt/3.999/trunk/t/web/gnupg-outgoing.t
==============================================================================
--- rt/3.999/trunk/t/web/gnupg-outgoing.t (original)
+++ rt/3.999/trunk/t/web/gnupg-outgoing.t Thu May 7 03:00:11 2009
@@ -19,18 +19,22 @@
use_ok('RT::Crypt::GnuPG');
-RT->config->set( GnuPG =>
- enable => 1,
- outgoing_messages_format => 'RFC',
+RT->config->set(
+ GnuPG => {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
);
-RT->config->set( GnuPGOptions =>
- homedir => scalar tempdir( CLEANUP => 1 ),
- passphrase => 'rt-test',
- 'no-permission-warning' => undef,
- 'trust-model' => 'always',
+RT->config->set(
+ GnuPGOptions => {
+ homedir => scalar tempdir( CLEANUP => 1 ),
+ passphrase => 'rt-test',
+ 'no-permission-warning' => undef,
+ 'trust-model' => 'always',
+ }
);
-RT->config->set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
+RT->config->set( 'MailPlugins' => [ 'Auth::MailFrom', 'Auth::GnuPG' ] );
RT::Test->import_gnupg_key('rt-recipient at example.com');
RT::Test->import_gnupg_key('rt-test at example.com', 'public');
Modified: rt/3.999/trunk/t/web/gnupg-select-keys-on-create.t
==============================================================================
--- rt/3.999/trunk/t/web/gnupg-select-keys-on-create.t (original)
+++ rt/3.999/trunk/t/web/gnupg-select-keys-on-create.t Thu May 7 03:00:11 2009
@@ -19,19 +19,23 @@
use_ok('RT::Crypt::GnuPG');
-RT->config->set( GnuPG =>
- enable => 1,
- outgoing_messages_format => 'RFC',
+RT->config->set(
+ GnuPG => {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
);
-RT->config->set( GnuPGOptions =>
- homedir => scalar tempdir( CLEANUP => 0 ),
- passphrase => 'rt-test',
- 'no-permission-warning' => undef,
+RT->config->set(
+ GnuPGOptions => {
+ homedir => scalar tempdir( CLEANUP => 0 ),
+ passphrase => 'rt-test',
+ 'no-permission-warning' => undef,
+ }
);
diag "GnuPG --homedir ". RT->config->get('GnuPGOptions')->{'homedir'} if $ENV{TEST_VERBOSE};
-RT->config->set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
+RT->config->set( 'MailPlugins' => [ 'Auth::MailFrom', 'Auth::GnuPG' ] );
my $queue = RT::Test->load_or_create_queue(
name => 'Regression',
Modified: rt/3.999/trunk/t/web/gnupg-select-keys-on-update.t
==============================================================================
--- rt/3.999/trunk/t/web/gnupg-select-keys-on-update.t (original)
+++ rt/3.999/trunk/t/web/gnupg-select-keys-on-update.t Thu May 7 03:00:11 2009
@@ -19,19 +19,23 @@
use_ok('RT::Crypt::GnuPG');
-RT->config->set( GnuPG =>
- enable => 1,
- outgoing_messages_format => 'RFC',
+RT->config->set(
+ GnuPG => {
+ enable => 1,
+ outgoing_messages_format => 'RFC',
+ }
);
-RT->config->set( GnuPGOptions =>
- homedir => scalar tempdir( CLEANUP => 0 ),
- passphrase => 'rt-test',
- 'no-permission-warning' => undef,
+RT->config->set(
+ GnuPGOptions => {
+ homedir => scalar tempdir( CLEANUP => 0 ),
+ passphrase => 'rt-test',
+ 'no-permission-warning' => undef,
+ }
);
diag "GnuPG --homedir ". RT->config->get('GnuPGOptions')->{'homedir'} if $ENV{TEST_VERBOSE};
-RT->config->set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
+RT->config->set( 'MailPlugins' => [ 'Auth::MailFrom', 'Auth::GnuPG' ] );
my $queue = RT::Test->load_or_create_queue(
name => 'Regression',
More information about the Rt-commit
mailing list