13 files changed, 43 insertions, 13 deletions
diff --git a/rt/t/api/cf_pattern.t b/rt/t/api/cf_pattern.t
index 89db2fea5..ffc5b3fa0 100644
--- a/rt/t/api/cf_pattern.t
+++ b/rt/t/api/cf_pattern.t
@@ -50,4 +50,4 @@ works($cf->SetPattern('(?!)')); # reject everything
 fails(add(''));
 fails(add('...'));
 
-1;
+undef $t;
diff --git a/rt/t/api/tickets_overlay_sql.t b/rt/t/api/tickets_overlay_sql.t
index 5bc614077..2ef2d4779 100644
--- a/rt/t/api/tickets_overlay_sql.t
+++ b/rt/t/api/tickets_overlay_sql.t
@@ -74,7 +74,7 @@ diag "Make sure we don't barf on invalid input for IS / IS NOT";
     unlike $tix->BuildSelectQuery, qr/foobar/, "didn't find foobar in the select";
     like $tix->BuildSelectQuery, qr/Subject IS NULL/, "found right clause";
     
-    my ($status, $msg) = $tix->FromSQL("Subject IS NOT 'foobar'");
+    ($status, $msg) = $tix->FromSQL("Subject IS NOT 'foobar'");
     ok ($status, "valid query") or diag("error: $msg");
     is $tix->Count, 2, "found two tickets";
     unlike $tix->BuildSelectQuery, qr/foobar/, "didn't find foobar in the select";
@@ -85,7 +85,7 @@ diag "Make sure we don't barf on invalid input for IS / IS NOT";
     my ($status, $msg) = $tix->FromSQL("Requestor.Signature LIKE 'foo'");
     ok (!$status, "invalid query - Signature not valid") or diag("error: $msg");
 
-    my ($status, $msg) = $tix->FromSQL("Requestor.EmailAddress LIKE 'jesse'");
+    ($status, $msg) = $tix->FromSQL("Requestor.EmailAddress LIKE 'jesse'");
     ok ($status, "valid query") or diag("error: $msg");
     is $tix->Count, 1, "found one ticket";
     like $tix->First->Subject, qr/another ticket/, "found the right ticket";
diff --git a/rt/t/mail/gnupg-incoming.t b/rt/t/mail/gnupg-incoming.t
index c34ed997a..c87925aa3 100644
--- a/rt/t/mail/gnupg-incoming.t
+++ b/rt/t/mail/gnupg-incoming.t
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 47;
+use RT::Test tests => 51;
 
 plan skip_all => 'GnuPG required.'
     unless eval 'use GnuPG::Interface; 1';
@@ -243,7 +243,6 @@ RT::Test->close_mailgate_ok($mail);
     ok(index($orig->Content, $buf) != -1, 'found original msg');
 }
 
-
 # test for signed mail by other key
 $buf = '';
 
@@ -355,3 +354,31 @@ is(@mail, 1, 'caught outgoing mail.');
     unlike( ($attach ? $attach->Content : ''), qr'really should not be there either');
 }
 
+
+# test that if it gets base64 transfer-encoded long mail then it doesn't hang
+{
+    local $SIG{ALRM} = sub {
+        ok 0, "timed out, web server is probably in deadlock";
+        exit;
+    };
+    alarm 30;
+    $buf = encode_base64('a'x(250*1024));
+    $mail = RT::Test->open_mailgate_ok($baseurl);
+    print $mail <<"EOF";
+From: recipient\@example.com
+To: general\@$RT::rtname
+Content-transfer-encoding: base64
+Subject: Long not encrypted message for queue
+
+$buf
+EOF
+    RT::Test->close_mailgate_ok($mail);
+    alarm 0;
+
+    my $tick = RT::Test->last_ticket;
+    is( $tick->Subject, 'Long not encrypted message for queue',
+        "Created the ticket"
+    );
+    my $content = $tick->Transactions->First->Content;
+    like $content, qr/a{1024,}/, 'content is not lost';
+}
diff --git a/rt/t/mail/sendmail.t b/rt/t/mail/sendmail.t
index 1f97bbb9f..215fba78a 100644
--- a/rt/t/mail/sendmail.t
+++ b/rt/t/mail/sendmail.t
@@ -535,4 +535,5 @@ diag q{regression test for #5248 from rt3.fsck.com} if $ENV{TEST_VERBOSE};
 
 # Don't taint the environment
 $everyone->PrincipalObj->RevokeRight(Right =>'SuperUser');
-1;
+
+@scrips_fired = ();
diff --git a/rt/t/ticket/cfsort-freeform-multiple.t b/rt/t/ticket/cfsort-freeform-multiple.t
index f8f5950ef..b2e8ec98b 100644
--- a/rt/t/ticket/cfsort-freeform-multiple.t
+++ b/rt/t/ticket/cfsort-freeform-multiple.t
@@ -135,3 +135,4 @@ run_tests();
 );
 run_tests();
 
+@tickets = ();
diff --git a/rt/t/ticket/cfsort-freeform-single.t b/rt/t/ticket/cfsort-freeform-single.t
index f1f506bea..7e178b8e8 100644
--- a/rt/t/ticket/cfsort-freeform-single.t
+++ b/rt/t/ticket/cfsort-freeform-single.t
@@ -187,5 +187,4 @@ diag "create another CF\n" if $ENV{TEST_VERBOSE};
 );
 run_tests();
 
-
-
+@tickets = ();
diff --git a/rt/t/ticket/search_by_cf_freeform_multiple.t b/rt/t/ticket/search_by_cf_freeform_multiple.t
index be5130651..45dc81c25 100644
--- a/rt/t/ticket/search_by_cf_freeform_multiple.t
+++ b/rt/t/ticket/search_by_cf_freeform_multiple.t
@@ -150,4 +150,4 @@ sub run_tests {
 }
 run_tests();
 
-exit 0;
+@tickets = ();
diff --git a/rt/t/ticket/search_by_cf_freeform_single.t b/rt/t/ticket/search_by_cf_freeform_single.t
index d5ff7ec0d..bbff8ad35 100644
--- a/rt/t/ticket/search_by_cf_freeform_single.t
+++ b/rt/t/ticket/search_by_cf_freeform_single.t
@@ -139,4 +139,4 @@ sub run_tests {
 }
 run_tests();
 
-exit 0;
+@tickets = ();
diff --git a/rt/t/ticket/search_by_links.t b/rt/t/ticket/search_by_links.t
index a8e955c8b..383f37646 100644
--- a/rt/t/ticket/search_by_links.t
+++ b/rt/t/ticket/search_by_links.t
@@ -130,3 +130,4 @@ my $pid = $tickets[1]->id;
 }
 run_tests();
 
+@tickets = ();
diff --git a/rt/t/ticket/search_by_watcher.t b/rt/t/ticket/search_by_watcher.t
index 9d94432d2..445c61e9b 100644
--- a/rt/t/ticket/search_by_watcher.t
+++ b/rt/t/ticket/search_by_watcher.t
@@ -276,5 +276,4 @@ my $nobody = RT::Nobody();
     is($tix->Count, 2, "found ticket(s)");
 }
 
-
-exit(0)
+@tickets = ();
diff --git a/rt/t/ticket/sort-by-queue.t b/rt/t/ticket/sort-by-queue.t
index df6e1ad0f..133c19408 100644
--- a/rt/t/ticket/sort-by-queue.t
+++ b/rt/t/ticket/sort-by-queue.t
@@ -98,3 +98,4 @@ sub run_tests {
 );
 run_tests();
 
+@tickets = ();
diff --git a/rt/t/ticket/sort-by-user.t b/rt/t/ticket/sort-by-user.t
index f9b1602f1..574fdcb42 100644
--- a/rt/t/ticket/sort-by-user.t
+++ b/rt/t/ticket/sort-by-user.t
@@ -150,3 +150,4 @@ run_tests();
 );
 run_tests();
 
+@tickets = ();
diff --git a/rt/t/web/compilation_errors.t b/rt/t/web/compilation_errors.t
index 36a006890..ab6997850 100644
--- a/rt/t/web/compilation_errors.t
+++ b/rt/t/web/compilation_errors.t
@@ -48,7 +48,7 @@ sub test_get {
 
         $file =~ s#^share/html/##;
         diag( "testing $url/$file" ) if $ENV{TEST_VERBOSE};
-        ok ($agent->get("$url/$file", "GET $url/$file"), "Can Get $url/$file");
+        ok ($agent->get("$url/$file"), "Can Get $url/$file");
         is ($agent->{'status'}, 200, "Loaded $file");
 #        ok( $agent->{'content'} =~ /Logout/i, "Found a logout link on $file ");
         ok( $agent->{'content'} !~ /Not logged in/i, "Still logged in for  $file");