[Rt-commit] [svn] r1650 - in rt/branches/3.3-TESTING: . lib/RT

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Tue Oct 12 17:01:07 2004
New Revision: 1650

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
Log:
 r1992 at tinbook:  jesse | 2004-10-12T21:00:33.006657Z
 RT-Ticket: 6182
 RT-Status: resolved
 


Modified: rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Ticket_Overlay.pm	Tue Oct 12 17:01:07 2004
@@ -2635,10 +2635,10 @@
 =begin testing
 
 my $t1 = RT::Ticket->new($RT::SystemUser);
-$t1->Create ( Subject => 'Merge test 1', Queue => 'general');
+$t1->Create ( Subject => 'Merge test 1', Queue => 'general', Requestor => 'merge1 at example.com');
 my $t1id = $t1->id;
 my $t2 = RT::Ticket->new($RT::SystemUser);
-$t2->Create ( Subject => 'Merge test 2', Queue => 'general');
+$t2->Create ( Subject => 'Merge test 2', Queue => 'general', Requestor => 'merge2 at example.com');
 my $t2id = $t2->id;
 my ($msg, $val) = $t1->MergeInto($t2->id);
 ok ($msg,$val);
@@ -2648,6 +2648,9 @@
 
 is ($t1->id, $t2->id);
 
+is ($t1->Requestors->MembersObj->Count, 2);
+
+
 =end testing
 
 =cut
@@ -2742,11 +2745,15 @@
         $addwatcher_type  =~ s/s$//;
 
         while ( my $watcher = $people->Next ) {
-            $MergeInto->_AddWatcher(
-                Type        => $watcher_type,
-                                  Silent => 1,
+            
+           my ($val, $msg) =  $MergeInto->_AddWatcher(
+                Type        => $addwatcher_type,
+                Silent => 1,
                 PrincipalId => $watcher->MemberId
             );
+            unless ($val) {
+                $RT::Logger->warning($msg);
+            }
     }
 
     }