[Rt-commit] rt branch, 4.0/testing-under-apache, created. rt-4.0.6-127-gb5c700d

[Thomas Sibley]

The branch, 4.0/testing-under-apache has been created
        at  b5c700d36b1e47d362b6a0880fbb1d4db7316568 (commit)

- Log -----------------------------------------------------------------
commit 13fbeb8dcb471938068af8826ce34b2a568c592f
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed May 23 10:49:59 2012 -0400

    Set ServerName to avoid warnings from apache during testing
    
    Without an explicit ServerName, apache sometimes warns:
    
        apache2: Could not reliably determine the server's fully qualified
        domain name, using 127.0.1.1 for ServerName

diff --git a/t/data/configs/apache2.2+fastcgi.conf.in b/t/data/configs/apache2.2+fastcgi.conf.in
index 3ec36dd..03eaa9a 100644
--- a/t/data/configs/apache2.2+fastcgi.conf.in
+++ b/t/data/configs/apache2.2+fastcgi.conf.in
@@ -12,6 +12,7 @@ Group @WEB_GROUP@
 </IfModule>
 </IfModule>
 
+ServerName localhost
 Listen %%LISTEN%%
 
 ErrorLog "%%LOG_FILE%%"
diff --git a/t/data/configs/apache2.2+mod_perl.conf.in b/t/data/configs/apache2.2+mod_perl.conf.in
index 3b1f3f6..20d2f44 100644
--- a/t/data/configs/apache2.2+mod_perl.conf.in
+++ b/t/data/configs/apache2.2+mod_perl.conf.in
@@ -30,6 +30,7 @@ Group @WEB_GROUP@
 </IfModule>
 </IfModule>
 
+ServerName localhost
 Listen %%LISTEN%%
 
 ErrorLog "%%LOG_FILE%%"

commit b5c700d36b1e47d362b6a0880fbb1d4db7316568
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed May 23 10:52:42 2012 -0400

    Set %Lifecycles explicitly so RT::Test can write it to disk for apache
    
    Apache was starting without the 'foo' lifecycle, causing the tests to
    fail.  This test file now passes for me under apache+mod_perl.

diff --git a/t/web/query_builder_queue_limits.t b/t/web/query_builder_queue_limits.t
index a3b9765..f583d64 100644
--- a/t/web/query_builder_queue_limits.t
+++ b/t/web/query_builder_queue_limits.t
@@ -11,6 +11,9 @@ $lifecycles->{foo} = {
 
 };
 
+# explicitly Set so RT::Test can catch our change
+RT->Config->Set( Lifecycles => %$lifecycles );
+
 RT::Lifecycle->FillCache();
 
 my $general = RT::Test->load_or_create_queue( Name => 'General' );

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