[Rt-commit] r17261 - in rt/3.8/branches/3.8.2-releng: . lib lib/RT t/mail t/web
falcone at bestpractical.com
falcone at bestpractical.com
Tue Dec 16 10:35:49 EST 2008
Author: falcone
Date: Tue Dec 16 10:35:48 2008
New Revision: 17261
Modified:
rt/3.8/branches/3.8.2-releng/ (props changed)
rt/3.8/branches/3.8.2-releng/lib/RT.pm.in
rt/3.8/branches/3.8.2-releng/lib/RT/Base.pm
rt/3.8/branches/3.8.2-releng/t/mail/crypt-gnupg.t
rt/3.8/branches/3.8.2-releng/t/mail/gateway.t
rt/3.8/branches/3.8.2-releng/t/mail/gnupg-bad.t
rt/3.8/branches/3.8.2-releng/t/mail/gnupg-incoming.t
rt/3.8/branches/3.8.2-releng/t/mail/gnupg-realmail.t
rt/3.8/branches/3.8.2-releng/t/mail/gnupg-reverification.t
rt/3.8/branches/3.8.2-releng/t/shredder/utils.pl
rt/3.8/branches/3.8.2-releng/t/web/crypt-gnupg.t
rt/3.8/branches/3.8.2-releng/t/web/gnupg-outgoing.t
rt/3.8/branches/3.8.2-releng/t/web/gnupg-select-keys-on-create.t
rt/3.8/branches/3.8.2-releng/t/web/gnupg-select-keys-on-update.t
Log:
- Merge //mirror/bps-public/rt/3.8/trunk to //mirror/bps-public/rt/3.8/branches/3.8.2-releng
Modified: rt/3.8/branches/3.8.2-releng/lib/RT.pm.in
==============================================================================
--- rt/3.8/branches/3.8.2-releng/lib/RT.pm.in (original)
+++ rt/3.8/branches/3.8.2-releng/lib/RT.pm.in Tue Dec 16 10:35:48 2008
@@ -439,6 +439,7 @@
require RT::ObjectCustomFieldValues;
require RT::Attributes;
require RT::Dashboard;
+ require RT::Approval;
# on a cold server (just after restart) people could have an object
# in the session, as we deserialize it so we never call constructor
Modified: rt/3.8/branches/3.8.2-releng/lib/RT/Base.pm
==============================================================================
--- rt/3.8/branches/3.8.2-releng/lib/RT/Base.pm (original)
+++ rt/3.8/branches/3.8.2-releng/lib/RT/Base.pm Tue Dec 16 10:35:48 2008
@@ -102,7 +102,7 @@
unless ( ref $self->{'user'} && $self->{'user'}->isa('RT::CurrentUser') ) {
my $msg = "$self was created without a CurrentUser."
." Any RT object which is subclass of RT::Base must be created"
- ." with a RT::CurrentUser or a RT::User obejct as the first argument.";
+ ." with a RT::CurrentUser or a RT::User object as the first argument.";
$msg .= "\n". Carp::longmess() if @_;
$RT::Logger->error( $msg );
Modified: rt/3.8/branches/3.8.2-releng/t/mail/crypt-gnupg.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/mail/crypt-gnupg.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/mail/crypt-gnupg.t Tue Dec 16 10:35:48 2008
@@ -12,9 +12,6 @@
plan tests => 92;
-RT->Config->Set( LogToScreen => 'debug' );
-RT->Config->Set( LogStackTraces => 'error' );
-
use File::Spec ();
use Cwd;
Modified: rt/3.8/branches/3.8.2-releng/t/mail/gateway.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/mail/gateway.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/mail/gateway.t Tue Dec 16 10:35:48 2008
@@ -678,7 +678,7 @@
is( $txns->First->Subject, "[$RT::rtname \#$id] correspondence", 'successfuly add correspond within take via email' );
$! = 0;
-ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $url --queue ext-mailgate --action resolve --debug"), "Opened the mailgate - $!");
+ok(open(MAIL, "|$RT::BinPath/rt-mailgate --url $url --queue ext-mailgate --action resolve"), "Opened the mailgate - $!");
print MAIL <<EOF;
From: root\@localhost
Subject: [@{[RT->Config->Get('rtname')]} \#$id] test
Modified: rt/3.8/branches/3.8.2-releng/t/mail/gnupg-bad.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/mail/gnupg-bad.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/mail/gnupg-bad.t Tue Dec 16 10:35:48 2008
@@ -17,7 +17,6 @@
my $homedir = RT::Test::get_abs_relocatable_dir(File::Spec->updir(),
qw(data gnupg keyrings));
-RT->Config->Set( LogToScreen => 'debug' );
RT->Config->Set( 'GnuPG',
Enable => 1,
OutgoingMessagesFormat => 'RFC' );
Modified: rt/3.8/branches/3.8.2-releng/t/mail/gnupg-incoming.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/mail/gnupg-incoming.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/mail/gnupg-incoming.t Tue Dec 16 10:35:48 2008
@@ -23,7 +23,6 @@
# catch any outgoing emails
RT::Test->set_mail_catcher;
-RT->Config->Set( LogToScreen => 'debug' );
RT->Config->Set( 'GnuPG',
Enable => 1,
OutgoingMessagesFormat => 'RFC' );
Modified: rt/3.8/branches/3.8.2-releng/t/mail/gnupg-realmail.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/mail/gnupg-realmail.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/mail/gnupg-realmail.t Tue Dec 16 10:35:48 2008
@@ -17,7 +17,6 @@
use File::Temp qw(tempdir);
my $homedir = tempdir( CLEANUP => 1 );
-RT->Config->Set( LogToScreen => 'debug' );
RT->Config->Set( 'GnuPG',
Enable => 1,
OutgoingMessagesFormat => 'RFC' );
Modified: rt/3.8/branches/3.8.2-releng/t/mail/gnupg-reverification.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/mail/gnupg-reverification.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/mail/gnupg-reverification.t Tue Dec 16 10:35:48 2008
@@ -15,7 +15,6 @@
use File::Temp qw(tempdir);
my $homedir = tempdir( CLEANUP => 1 );
-RT->Config->Set( LogToScreen => 'debug' );
RT->Config->Set( 'GnuPG',
Enable => 1,
OutgoingMessagesFormat => 'RFC' );
Modified: rt/3.8/branches/3.8.2-releng/t/shredder/utils.pl
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/shredder/utils.pl (original)
+++ rt/3.8/branches/3.8.2-releng/t/shredder/utils.pl Tue Dec 16 10:35:48 2008
@@ -149,7 +149,7 @@
}
my $rt_setup_database = RT::Test::get_relocatable_file(
'rt-setup-database', (File::Spec->updir(), File::Spec->updir(), 'sbin'));
- my $cmd = "$^X $rt_setup_database --action init";
+ my $cmd = "$^X $rt_setup_database --action init 2>&1";
my ($child_out, $child_in);
my $pid = open2($child_out, $child_in, $cmd);
Modified: rt/3.8/branches/3.8.2-releng/t/web/crypt-gnupg.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/web/crypt-gnupg.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/web/crypt-gnupg.t Tue Dec 16 10:35:48 2008
@@ -17,8 +17,6 @@
RT::Test->set_mail_catcher;
-RT->Config->Set( LogToScreen => 'debug' );
-RT->Config->Set( LogStackTraces => 'error' );
RT->Config->Set( CommentAddress => 'general at example.com');
RT->Config->Set( CorrespondAddress => 'general at example.com');
RT->Config->Set( DefaultSearchResultFormat => qq{
Modified: rt/3.8/branches/3.8.2-releng/t/web/gnupg-outgoing.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/web/gnupg-outgoing.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/web/gnupg-outgoing.t Tue Dec 16 10:35:48 2008
@@ -17,9 +17,6 @@
RT::Test->set_mail_catcher;
-RT->Config->Set( LogToScreen => 'debug' );
-RT->Config->Set( LogStackTraces => 'error' );
-
use_ok('RT::Crypt::GnuPG');
RT->Config->Set( GnuPG =>
Modified: rt/3.8/branches/3.8.2-releng/t/web/gnupg-select-keys-on-create.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/web/gnupg-select-keys-on-create.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/web/gnupg-select-keys-on-create.t Tue Dec 16 10:35:48 2008
@@ -17,9 +17,6 @@
RT::Test->set_mail_catcher;
-RT->Config->Set( LogToScreen => 'debug' );
-RT->Config->Set( LogStackTraces => 'error' );
-
use_ok('RT::Crypt::GnuPG');
RT->Config->Set( GnuPG =>
Modified: rt/3.8/branches/3.8.2-releng/t/web/gnupg-select-keys-on-update.t
==============================================================================
--- rt/3.8/branches/3.8.2-releng/t/web/gnupg-select-keys-on-update.t (original)
+++ rt/3.8/branches/3.8.2-releng/t/web/gnupg-select-keys-on-update.t Tue Dec 16 10:35:48 2008
@@ -17,9 +17,6 @@
RT::Test->set_mail_catcher;
-RT->Config->Set( LogToScreen => 'debug' );
-RT->Config->Set( LogStackTraces => 'error' );
-
use_ok('RT::Crypt::GnuPG');
RT->Config->Set( GnuPG =>
More information about the Rt-commit
mailing list