[Rt-commit] rt branch, 4.0/oracle-testing, created. rt-4.0.11-89-g80872a1

Thomas Sibley trs at bestpractical.com
Thu Apr 25 20:03:49 EDT 2013


The branch, 4.0/oracle-testing has been created
        at  80872a1bc078dcf61933561a8a315c737087ddde (commit)

- Log -----------------------------------------------------------------
commit 35938d0b61a22b20d6506b55b7431dbd762a54e6
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Aug 31 17:10:50 2012 -0700

    Remove a stray signal handler used for debugging

diff --git a/t/api/rights_show_ticket.t b/t/api/rights_show_ticket.t
index c8107fe..b7bec70 100644
--- a/t/api/rights_show_ticket.t
+++ b/t/api/rights_show_ticket.t
@@ -207,7 +207,6 @@ diag "Testing with UseSQLForACLChecks => $option";
 }
 
 sub have_no_rights {
-    $SIG{'INT'} = $SIG{'TERM'} = sub { print STDERR Carp::longmess('boo'); exit 1 };
     local $Test::Builder::Level = $Test::Builder::Level + 1;
     foreach my $u ( @_ ) {
         foreach my $q (

commit cec052c8fce236c9a743837859c225bec1e5e0e9
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Aug 31 17:11:13 2012 -0700

    Send all test servers TERM instead of TERM to apache and INT to plack
    
    Plack handles TERM just fine.  When testing under Oracle, SIGINT is
    trapped and ignored by the Oracle client libraries, leading to a
    deadlock for any test files which specify actual_server => 1 (or set a
    plack web handler explicitly).  SIGTERM is respected, however, and
    avoids the deadlock.

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 55fd88a..53fdaef 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -1502,9 +1502,7 @@ sub stop_server {
     my $in_end = shift;
     return unless @SERVERS;
 
-    my $sig = 'TERM';
-    $sig = 'INT' if $ENV{'RT_TEST_WEB_HANDLER'} eq "plack";
-    kill $sig, @SERVERS;
+    kill 'TERM', @SERVERS;
     foreach my $pid (@SERVERS) {
         if ($ENV{RT_TEST_WEB_HANDLER} =~ /^apache/) {
             sleep 1 while kill 0, $pid;

commit 20eb67f5b9aeadb98524b08fb3473103d8bcac45
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Apr 25 16:42:31 2013 -0700

    Configure an IndexName for Oracle FTS tests
    
    An IndexName became required with 8aad388 despite rt-fulltext-indexer's
    fallback of "rt_fts_index", which is the default name created by
    rt-setup-fulltext-index.  The test file failed because the indexer
    didn't update the index due to FTS being turned off by the config check.

diff --git a/t/fts/indexed_oracle.t b/t/fts/indexed_oracle.t
index 98db304..a5b15bd 100644
--- a/t/fts/indexed_oracle.t
+++ b/t/fts/indexed_oracle.t
@@ -6,7 +6,7 @@ use RT::Test tests => undef;
 plan skip_all => 'Not Oracle' unless RT->Config->Get('DatabaseType') eq 'Oracle';
 plan tests => 13;
 
-RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 1 );
+RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 1, IndexName => 'rt_fts_index' );
 
 setup_indexing();
 

commit 80872a1bc078dcf61933561a8a315c737087ddde
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Apr 25 16:47:14 2013 -0700

    Avoid a warning; FIELD may not be passed to _SQLLimit
    
    This warning crops up when an Oracle FTS query is run.  The _SQLLimit
    provides a FUNCTION but no FIELD.

diff --git a/lib/RT/Tickets_SQL.pm b/lib/RT/Tickets_SQL.pm
index 608862a..2c572f9 100644
--- a/lib/RT/Tickets_SQL.pm
+++ b/lib/RT/Tickets_SQL.pm
@@ -74,7 +74,7 @@ sub _InitSQL {
 
 sub _SQLLimit {
   my $self = shift;
-    my %args = (@_);
+    my %args = (FIELD => '', @_);
     if ($args{'FIELD'} eq 'EffectiveId' &&
          (!$args{'ALIAS'} || $args{'ALIAS'} eq 'main' ) ) {
         $self->{'looking_at_effective_id'} = 1;

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


More information about the Rt-commit mailing list