[Rt-commit] rt branch, 4.0/oracle-testing, created. rt-4.0.18-50-g4739679
Alex Vandiver
alexmv at bestpractical.com
Sat Nov 9 00:53:54 EST 2013
The branch, 4.0/oracle-testing has been created
at 47396796a467719ef74a80a415e2d47be49fff40 (commit)
- Log -----------------------------------------------------------------
commit 11b8e03b08e0e27642987f9e0f3cc5a65b522dd8
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 84b2b8fa39cdb87b0680fc4fd8ab8374aab33c07
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 508c7c2..66be4b1 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -1503,9 +1503,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 a401cec82c43f01a418411e8addfd19acf384942
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 a79bd50d0658a5be314443fb13ab0354d6d206c7
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 cd18cb1..476c2e8 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;
commit 10df0c99667b358ddc08489d37ae716abb4223b4
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Nov 8 22:00:53 2013 -0500
Warnings avoidance on NULL (or blank, for Oracle) description
diff --git a/share/html/Articles/Article/ExtractIntoClass.html b/share/html/Articles/Article/ExtractIntoClass.html
index b64a5a9..d09a918 100644
--- a/share/html/Articles/Article/ExtractIntoClass.html
+++ b/share/html/Articles/Article/ExtractIntoClass.html
@@ -55,7 +55,7 @@
% $Classes->LimitToEnabled();
% while (my $Class = $Classes->Next) {
<li><a href="ExtractIntoTopic.html?Ticket=<%$Ticket%>&Class=<%$Class->Id%>" onclick="document.getElementById('topics-'+<% $Class->Id |n,j%>).style.display = (document.getElementById('topics-'+<% $Class->Id |n,j%>).style.display == 'block') ? 'none' : 'block'; return false;"><%$Class->Name%></a>:
-<%$Class->Description%>
+<%$Class->Description || ''%>
<div id="topics-<%$Class->Id%>" style="display: none">
<form action="ExtractFromTicket.html">
<input type="hidden" name="Ticket" value="<% $Ticket %>" />
commit 4b7842dc0297c37b8ed9b986cfa90e1f4c504f6e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Nov 8 22:07:47 2013 -0500
Show (no value) for an unset new value
diff --git a/lib/RT/Transaction.pm b/lib/RT/Transaction.pm
index eab7192..6e9f78f 100644
--- a/lib/RT/Transaction.pm
+++ b/lib/RT/Transaction.pm
@@ -1035,7 +1035,8 @@ sub BriefDescription {
else {
return $self->loc( "[_1] changed from [_2] to [_3]",
$self->loc($self->Field),
- ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")) , "'". $self->NewValue."'" );
+ ($self->OldValue? "'".$self->OldValue ."'" : $self->loc("(no value)")),
+ ($self->NewValue? "'".$self->NewValue ."'" : $self->loc("(no value)")));
}
},
PurgeTransaction => sub {
diff --git a/t/web/user_update.t b/t/web/user_update.t
index f55c773..c0e9e52 100644
--- a/t/web/user_update.t
+++ b/t/web/user_update.t
@@ -35,7 +35,7 @@ $m->text_contains("Lang changed from 'en_us' to 'ja'");
$m->text_contains("実å", "Page content is japanese");
$m->submit_form_ok({ with_fields => { Lang => ''} },
"And set to the default");
-$m->text_contains("Langã¯ã€Œ'ja'ã€ã‹ã‚‰ã€Œ''ã€ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸ");
+$m->text_contains("Langã¯ã€Œ'ja'ã€ã‹ã‚‰ã€Œ(値ãªã—)ã€ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸ");
$m->text_contains("Real Name", "Page content is english");
undef $m;
commit abdc9f83b5b512a818287559955b19ad238e3555
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Nov 8 22:22:41 2013 -0500
Warnings avoidance for empty (meaning NULL, on Oracle) subjects
diff --git a/share/html/Ticket/Elements/EditBasics b/share/html/Ticket/Elements/EditBasics
index 0d4159f..95f49d3 100644
--- a/share/html/Ticket/Elements/EditBasics
+++ b/share/html/Ticket/Elements/EditBasics
@@ -53,9 +53,10 @@ $InTable => 0
</%ARGS>
<%INIT>
unless ( @fields ) {
+ my $subject = $defaults{'Subject'} || $TicketObj->Subject;
@fields = (
{ name => 'Subject',
- html => '<input name="Subject" value="'.$m->interp->apply_escapes( $defaults{'Subject'} || $TicketObj->Subject, 'h' ).'" />',
+ html => '<input name="Subject" value="'.(defined($subject) ? $m->interp->apply_escapes( $subject, 'h' ) : '').'" />',
},
{ name => 'Status',
comp => '/Elements/SelectStatus',
commit 47396796a467719ef74a80a415e2d47be49fff40
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Nov 8 22:25:01 2013 -0500
Warnings avoidance for Oracle
The empty string is the same as NULL in Oracle, leading the Type column
of UserDefined groups to be undef. Default it to '', which is safe
because no other false value is expected in Type.
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 66be4b1..0aad195 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -926,7 +926,7 @@ sub set_rights {
$acl->Limit( FIELD => 'RightName', OPERATOR => '!=', VALUE => 'SuperUser' );
while ( my $ace = $acl->Next ) {
my $obj = $ace->PrincipalObj->Object;
- if ( $obj->isa('RT::Group') && $obj->Type eq 'UserEquiv' && $obj->Instance == RT->Nobody->id ) {
+ if ( $obj->isa('RT::Group') && ($obj->Type||'') eq 'UserEquiv' && $obj->Instance == RT->Nobody->id ) {
next;
}
$ace->Delete;
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list