[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.8-32-g6412ba2

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  6412ba2fd026d5efe568a65cf641b84b7ff3b040 (commit)
       via  2ddc4d92f35a304e43ecc80e7610b59eb15bc87f (commit)
       via  76122fcaf32e1b9b24af059260cd60d69219d272 (commit)
      from  a2704c9c71d8495f8ca549806c5c64b00a104f61 (commit)

Summary of changes:
 lib/RT/Test.pm |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 76122fcaf32e1b9b24af059260cd60d69219d272
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue May 11 03:53:26 2010 +0400

    bootstrap_logging in RT::Test and debug log in tmp dir

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 8955170..09372a0 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -223,8 +223,6 @@ sub bootstrap_config {
     print $config qq{
 Set( \$WebPort , $port);
 Set( \$WebBaseURL , "http://localhost:\$WebPort");
-Set( \$LogToSyslog , undef);
-Set( \$LogToScreen , "warning");
 Set( \$RTAddressRegexp , qr/^bad_re_that_doesnt_match\$/);
 Set( \$MailCommand, 'testfile');
 };
@@ -238,6 +236,8 @@ Set( \$MailCommand, 'testfile');
     print $config "Set( \$DevelMode, 0 );\n"
         if $INC{'Devel/Cover.pm'};
 
+    $self->bootstrap_logging( $config );
+
     # set mail catcher
     my $mail_catcher = $tmp{'mailbox'} = File::Spec->catfile(
         $tmp{'directory'}->dirname, 'mailbox.eml'
@@ -254,7 +254,7 @@ Set( \$MailCommand, sub {
     close \$handle;
 } );
 END
-
+    
     print $config $args{'config'} if $args{'config'};
 
     print $config "\n1;\n";
@@ -264,6 +264,29 @@ END
     return $config;
 }
 
+sub bootstrap_logging {
+    my $self = shift;
+    my $config = shift;
+
+    # prepare file for logging
+    $tmp{'log'}{'RT'} = File::Spec->catfile(
+        "$tmp{'directory'}", 'rt.debug.log'
+    );
+    open my $fh, '>', $tmp{'log'}{'RT'}
+        or die "Couldn't open $tmp{'config'}{'RT'}: $!";
+    # make world writable so apache under different user
+    # can write into it
+    chmod 0666, $tmp{'log'}{'RT'};
+
+    print $config <<END;
+Set( \$LogToSyslog , undef);
+Set( \$LogToScreen , "warning");
+Set( \$LogToFile, 'debug' );
+Set( \$LogDir, q{$tmp{'directory'}} );
+Set( \$LogToFileNamed, 'rt.debug.log' );
+END
+}
+
 sub set_config_wrapper {
     my $self = shift;
 

commit 2ddc4d92f35a304e43ecc80e7610b59eb15bc87f
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue May 11 03:54:06 2010 +0400

    we don't need set MailCommand, redine it a few lines later

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 09372a0..2225f87 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -224,7 +224,6 @@ sub bootstrap_config {
 Set( \$WebPort , $port);
 Set( \$WebBaseURL , "http://localhost:\$WebPort");
 Set( \$RTAddressRegexp , qr/^bad_re_that_doesnt_match\$/);
-Set( \$MailCommand, 'testfile');
 };
     if ( $ENV{'RT_TEST_DB_SID'} ) { # oracle case
         print $config "Set( \$DatabaseName , '$ENV{'RT_TEST_DB_SID'}' );\n";

commit 6412ba2fd026d5efe568a65cf641b84b7ff3b040
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed May 12 00:40:42 2010 +0400

    using Web{Domain, Port and Path} should be enough these days

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 2225f87..337ab3d 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -221,8 +221,9 @@ sub bootstrap_config {
         or die "Couldn't open $tmp{'config'}{'RT'}: $!";
 
     print $config qq{
-Set( \$WebPort , $port);
-Set( \$WebBaseURL , "http://localhost:\$WebPort");
+Set( \$WebDomain, "localhost");
+Set( \$WebPort,   $port);
+Set( \$WebPath,   "");
 Set( \$RTAddressRegexp , qr/^bad_re_that_doesnt_match\$/);
 };
     if ( $ENV{'RT_TEST_DB_SID'} ) { # oracle case

-----------------------------------------------------------------------