[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-517-g1b423b6

Shawn Moore sartak at bestpractical.com
Tue Aug 24 02:19:18 EDT 2010


The branch, 3.9-trunk has been updated
       via  1b423b66432c6d92ee9456c60a6047dc704b577e (commit)
       via  26a43f70acca21d136e0e2e6054668a8d58dffcb (commit)
      from  a6dcdd8040b648b192643fdda5fb92e436e9a676 (commit)

Summary of changes:
 lib/RT/Test.pm                            |   13 +++++++-
 t/00-mason-syntax.t                       |    2 +-
 t/api/rights_show_ticket.t                |    2 +-
 t/customfields/access_via_queue.t         |    8 ++--
 t/customfields/sort_order.t               |    6 ++--
 t/lifecycles/basics.t                     |   18 +++++-----
 t/lifecycles/dates.t                      |   16 +++++-----
 t/lifecycles/moving.t                     |    8 ++--
 t/mail/charsets-outgoing.t                |   40 +++++++++++-------------
 t/mail/crypt-gnupg.t                      |   26 ++++++++--------
 t/mail/extractsubjecttag.t                |    8 ++--
 t/mail/gateway.t                          |   48 ++++++++++++++--------------
 t/mail/gnupg-bad.t                        |   24 +++++++-------
 t/mail/gnupg-realmail.t                   |    6 ++--
 t/mail/gnupg-reverification.t             |    8 ++--
 t/mail/mime_decoding.t                    |   13 +++----
 t/mail/outlook.t                          |   11 ++----
 t/mail/sendmail.t                         |    4 +-
 t/shredder/02queue.t                      |   10 +++---
 t/shredder/02template.t                   |    6 ++--
 t/ticket/cfsort-freeform-multiple.t       |    4 +-
 t/ticket/cfsort-freeform-single.t         |    6 ++--
 t/ticket/deferred_owner.t                 |   17 +++++-----
 t/ticket/linking.t                        |   10 +++---
 t/ticket/search_by_cf_freeform_multiple.t |    2 +-
 t/ticket/search_by_cf_freeform_single.t   |    2 +-
 t/ticket/sort-by-queue.t                  |    2 +-
 t/ticket/sort-by-user.t                   |    2 +-
 t/web/basic.t                             |    1 -
 t/web/cf_access.t                         |   12 +++----
 t/web/cf_date.t                           |   11 +++---
 t/web/cf_datetime.t                       |   11 +++---
 t/web/cf_onqueue.t                        |    6 ++--
 t/web/cf_select_one.t                     |   20 +++++-------
 t/web/compilation_errors.t                |    3 +-
 t/web/gnupg-outgoing.t                    |    2 +-
 t/web/gnupg-select-keys-on-create.t       |   20 ++++++------
 t/web/gnupg-select-keys-on-update.t       |   20 ++++++------
 t/web/query_builder.t                     |   26 +++++++--------
 t/web/rights.t                            |   10 +++---
 t/web/ticket_owner.t                      |   30 +++++++++---------
 t/web/ticket_owner_autocomplete.t         |   10 +++---
 t/web/ticket_seen.t                       |    4 +-
 43 files changed, 249 insertions(+), 259 deletions(-)

- Log -----------------------------------------------------------------
commit 26a43f70acca21d136e0e2e6054668a8d58dffcb
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Aug 24 02:17:41 2010 -0400

    Export a diag that only runs if TEST_VERBOSE is set

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 4c2a42d..d1b8dec 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -75,7 +75,7 @@ wrap 'HTTP::Request::Common::form_data',
    };
 
 
-our @EXPORT = qw(is_empty);
+our @EXPORT = qw(is_empty diag);
 our ($port, $dbname);
 our @SERVERS;
 
@@ -178,6 +178,12 @@ sub import {
     }
 
     Test::More->export_to_level($level);
+
+    # blow away their diag so we can redefine it without warning
+    # better than "no warnings 'redefine'" because we might accidentally
+    # suppress a mistaken redefinition
+    no strict 'refs';
+    delete ${ caller($level) . '::' }{diag};
     __PACKAGE__->export_to_level($level);
 }
 
@@ -1295,6 +1301,11 @@ sub process_in_file {
     return ($out_fh, $out_conf);
 }
 
+sub diag {
+    return unless $ENV{TEST_VERBOSE};
+    goto \&Test::More::diag;
+}
+
 END {
     my $Test = RT::Test->builder;
     return if $Test->{Original_Pid} != $$;

commit 1b423b66432c6d92ee9456c60a6047dc704b577e
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Aug 24 02:19:28 2010 -0400

    Remove most explicit uses of if $ENV{TEST_VERBOSE}
    
        Except for shredder tests which can't use RT::Test normally, I guess
        because of weird database needs

diff --git a/t/00-mason-syntax.t b/t/00-mason-syntax.t
index 0584f63..a451805 100644
--- a/t/00-mason-syntax.t
+++ b/t/00-mason-syntax.t
@@ -14,7 +14,7 @@ find( {
         return if /(?:\.(?:jpe?g|png|gif|rej)|\~)$/i;
         return if m{/\.[^/]+\.swp$}; # vim swap files
         return unless -f $_;
-        diag "testing $_" if $ENV{'TEST_VERBOSE'};
+        diag "testing $_";
         eval { compile_file($_) } and return;
         $ok = 0;
         diag "error in ${File::Find::name}:\n$@";
diff --git a/t/api/rights_show_ticket.t b/t/api/rights_show_ticket.t
index c805c9f..3e1d074 100644
--- a/t/api/rights_show_ticket.t
+++ b/t/api/rights_show_ticket.t
@@ -26,7 +26,7 @@ ok $user_b && $user_b->id, 'loaded or created user';
 
 foreach my $option (0 .. 1 ) { RT->Config->Set( 'UseSQLForACLChecks' => $option );
 
-diag "Testing with UseSQLForACLChecks => $option" if $ENV{TEST_VERBOSE};
+diag "Testing with UseSQLForACLChecks => $option";
 
 # Global Cc has right, a User is nobody
 {
diff --git a/t/customfields/access_via_queue.t b/t/customfields/access_via_queue.t
index c291860..f372f31 100644
--- a/t/customfields/access_via_queue.t
+++ b/t/customfields/access_via_queue.t
@@ -11,7 +11,7 @@ my $queue_name = "CFSortQueue-$$";
 my $queue = RT::Test->load_or_create_queue( Name => $queue_name );
 ok($queue && $queue->id, "$queue_name - test queue creation");
 
-diag "create a CF\n" if $ENV{TEST_VERBOSE};
+diag "create a CF";
 my $cf_name = "Rights$$";
 my $cf;
 {
@@ -98,7 +98,7 @@ ok( RT::Test->set_rights(
 my ($baseurl, $m) = RT::Test->started_ok;
 ok $m->login( tester => 'password' ), 'logged in';
 
-diag "check that we have no the CF on the create" if $ENV{'TEST_VERBOSE'};
+diag "check that we have no the CF on the create";
 {
     $m->submit_form(
         form_name => "CreateTicketInQueue",
@@ -123,7 +123,7 @@ diag "check that we have no the CF on the create" if $ENV{'TEST_VERBOSE'};
     ok !$form->find_input( $cf_field ), 'no form field on the page';
 }
 
-diag "check that we see CF as Cc" if $ENV{'TEST_VERBOSE'};
+diag "check that we see CF as Cc";
 {
     my $ticket = RT::Ticket->new( $tester );
     my ($tid, $msg) = $ticket->Create( Queue => $queue, Subject => 'test', Cc => $tester->id );
@@ -133,7 +133,7 @@ diag "check that we see CF as Cc" if $ENV{'TEST_VERBOSE'};
     $m->content_like(qr/$cf_name/, "see CF");
 }
 
-diag "check that owner can see and edit CF" if $ENV{'TEST_VERBOSE'};
+diag "check that owner can see and edit CF";
 {
     my $ticket = RT::Ticket->new( $tester );
     my ($tid, $msg) = $ticket->Create( Queue => $queue, Subject => 'test', Cc => $tester->id, Owner => $tester->id );
diff --git a/t/customfields/sort_order.t b/t/customfields/sort_order.t
index c5c808c..fe6d37c 100644
--- a/t/customfields/sort_order.t
+++ b/t/customfields/sort_order.t
@@ -11,7 +11,7 @@ my $queue_name = "CFSortQueue-$$";
 my $queue = RT::Test->load_or_create_queue( Name => $queue_name );
 ok($queue && $queue->id, "$queue_name - test queue creation");
 
-diag "create multiple CFs: B, A and C" if $ENV{TEST_VERBOSE};
+diag "create multiple CFs: B, A and C";
 my @cfs = ();
 {
     my $cf = RT::CustomField->new( $RT::SystemUser );
@@ -47,7 +47,7 @@ my @cfs = ();
 my ($baseurl, $m) = RT::Test->started_ok;
 ok $m->login( root => 'password' ), 'logged in';
 
-diag "reorder CFs: C, A and B" if $ENV{TEST_VERBOSE};
+diag "reorder CFs: C, A and B";
 {
     $m->get( '/Admin/Queues/' );
     $m->follow_link_ok( {text => $queue->id} );
@@ -64,7 +64,7 @@ diag "reorder CFs: C, A and B" if $ENV{TEST_VERBOSE};
     is_deeply(\@tmp, ['CF C', 'CF A', 'CF B']);
 }
 
-diag "check ticket create, display and edit pages" if $ENV{TEST_VERBOSE};
+diag "check ticket create, display and edit pages";
 {
     $m->submit_form(
         form_name => "CreateTicketInQueue",
diff --git a/t/lifecycles/basics.t b/t/lifecycles/basics.t
index 70d4680..c269194 100644
--- a/t/lifecycles/basics.t
+++ b/t/lifecycles/basics.t
@@ -18,7 +18,7 @@ my $tstatus = sub {
     return $ticket->Status;
 };
 
-diag "check basic API" if $ENV{TEST_VERBOSE};
+diag "check basic API";
 {
     my $schema = $general->lifecycle;
     isa_ok($schema, 'RT::Lifecycle');
@@ -31,7 +31,7 @@ diag "check basic API" if $ENV{TEST_VERBOSE};
 my ($baseurl, $m) = RT::Test->started_ok;
 ok $m->login, 'logged in';
 
-diag "check status input on create" if $ENV{TEST_VERBOSE};
+diag "check status input on create";
 {
     $m->goto_create_ticket( $general );
 
@@ -52,7 +52,7 @@ diag "check status input on create" if $ENV{TEST_VERBOSE};
     ok $valid, 'all statuses in the form are valid';
 }
 
-diag "create a ticket" if $ENV{TEST_VERBOSE};
+diag "create a ticket";
 my $tid;
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
@@ -61,7 +61,7 @@ my $tid;
     is $ticket->Status, 'new', 'correct status';
 }
 
-diag "new ->(open it)-> open" if $ENV{TEST_VERBOSE};
+diag "new ->(open it)-> open";
 {
     ok $m->goto_ticket( $tid ), 'opened a ticket';
 
@@ -88,7 +88,7 @@ diag "new ->(open it)-> open" if $ENV{TEST_VERBOSE};
     is $tstatus->($tid), 'open', 'changed status';
 }
 
-diag "open ->(stall)-> stalled" if $ENV{TEST_VERBOSE};
+diag "open ->(stall)-> stalled";
 {
     is $tstatus->($tid), 'open', 'ticket is open';
 
@@ -117,7 +117,7 @@ diag "open ->(stall)-> stalled" if $ENV{TEST_VERBOSE};
     is $tstatus->($tid), 'stalled', 'changed status';
 }
 
-diag "stall ->(open it)-> open" if $ENV{TEST_VERBOSE};
+diag "stall ->(open it)-> open";
 {
     is $tstatus->($tid), 'stalled', 'ticket is stalled';
 
@@ -144,7 +144,7 @@ diag "stall ->(open it)-> open" if $ENV{TEST_VERBOSE};
     is $tstatus->($tid), 'open', 'changed status';
 }
 
-diag "open -> deleted, only via modify" if $ENV{TEST_VERBOSE};
+diag "open -> deleted, only via modify";
 {
     is $tstatus->($tid), 'open', 'ticket is open';
 
@@ -163,7 +163,7 @@ diag "open -> deleted, only via modify" if $ENV{TEST_VERBOSE};
     is $tstatus->($tid), 'deleted', 'deleted ticket';
 }
 
-diag "deleted -> X via modify, only open is available" if $ENV{TEST_VERBOSE};
+diag "deleted -> X via modify, only open is available";
 {
     is $tstatus->($tid), 'deleted', 'ticket is deleted';
 
@@ -177,7 +177,7 @@ diag "deleted -> X via modify, only open is available" if $ENV{TEST_VERBOSE};
     is join('-', @form_values), '-open', 'only open and default available';
 }
 
-diag "check illegal values and transitions" if $ENV{TEST_VERBOSE};
+diag "check illegal values and transitions";
 {
     {
         my $ticket = RT::Ticket->new( $RT::SystemUser );
diff --git a/t/lifecycles/dates.t b/t/lifecycles/dates.t
index 8cdfef4..9f5c735 100644
--- a/t/lifecycles/dates.t
+++ b/t/lifecycles/dates.t
@@ -26,7 +26,7 @@ my $tstatus = sub {
 my ($baseurl, $m) = RT::Test->started_ok;
 ok $m->login, 'logged in';
 
-diag "check basic API" if $ENV{TEST_VERBOSE};
+diag "check basic API";
 {
     my $schema = $general->lifecycle;
     isa_ok($schema, 'RT::Lifecycle');
@@ -37,7 +37,7 @@ diag "check basic API" if $ENV{TEST_VERBOSE};
     is $schema->name, 'delivery', "it's a delivery schema";
 }
 
-diag "dates on create for default schema" if $ENV{TEST_VERBOSE};
+diag "dates on create for default schema";
 {
     {
         my $ticket = RT::Ticket->new( $RT::SystemUser );
@@ -115,7 +115,7 @@ diag "dates on create for default schema" if $ENV{TEST_VERBOSE};
     }
 }
 
-diag "dates on create for delivery schema" if $ENV{TEST_VERBOSE};
+diag "dates on create for delivery schema";
 {
     {
         my $ticket = RT::Ticket->new( $RT::SystemUser );
@@ -136,7 +136,7 @@ diag "dates on create for delivery schema" if $ENV{TEST_VERBOSE};
             Subject => 'test',
         );
         ok $id, 'created a ticket';
-        diag($msg) if $ENV{TEST_VERBOSE};
+        diag($msg);
         is $ticket->Status, 'ordered', "Status is ordered";
         my ($statusval,$statusmsg) = $ticket->SetStatus('on way');
         ok($statusval,$statusmsg);
@@ -209,7 +209,7 @@ diag "dates on create for delivery schema" if $ENV{TEST_VERBOSE};
     }
 }
 
-diag "dates on status change for default schema" if $ENV{TEST_VERBOSE};
+diag "dates on status change for default schema";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     my ($id, $msg) = $ticket->Create(
@@ -244,7 +244,7 @@ diag "dates on status change for default schema" if $ENV{TEST_VERBOSE};
     ok $ticket->ResolvedObj->Unix > 0, 'resolved is set';
 }
 
-diag "dates on status change for delivery schema" if $ENV{TEST_VERBOSE};
+diag "dates on status change for delivery schema";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     my ($id, $msg) = $ticket->Create(
@@ -274,7 +274,7 @@ diag "dates on status change for delivery schema" if $ENV{TEST_VERBOSE};
     ok $ticket->ResolvedObj->Unix > 0, 'resolved is set';
 }
 
-diag "add partial map between general->delivery" if $ENV{TEST_VERBOSE};
+diag "add partial map between general->delivery";
 {
     my $schemas = RT->Config->Get('Lifecycles');
     $schemas->{'__maps__'} = {
@@ -288,7 +288,7 @@ diag "add partial map between general->delivery" if $ENV{TEST_VERBOSE};
     RT::Lifecycle->fill_cache;
 }
 
-diag "check date changes on moving a ticket" if $ENV{TEST_VERBOSE};
+diag "check date changes on moving a ticket";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     my ($id, $msg) = $ticket->Create(
diff --git a/t/lifecycles/moving.t b/t/lifecycles/moving.t
index 52ccb5a..59ce82e 100644
--- a/t/lifecycles/moving.t
+++ b/t/lifecycles/moving.t
@@ -23,7 +23,7 @@ my $tstatus = sub {
     return $ticket->Status;
 };
 
-diag "check moving without a map" if $ENV{TEST_VERBOSE};
+diag "check moving without a map";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     my ($id, $msg) = $ticket->Create(
@@ -38,7 +38,7 @@ diag "check moving without a map" if $ENV{TEST_VERBOSE};
     is $ticket->Status, 'new', 'status is steal the same';
 }
 
-diag "add partial map" if $ENV{TEST_VERBOSE};
+diag "add partial map";
 {
     my $schemas = RT->Config->Get('Lifecycles');
     $schemas->{'__maps__'} = {
@@ -49,7 +49,7 @@ diag "add partial map" if $ENV{TEST_VERBOSE};
     RT::Lifecycle->fill_cache;
 }
 
-diag "check moving with a partial map" if $ENV{TEST_VERBOSE};
+diag "check moving with a partial map";
 {
     {
         my $ticket = RT::Ticket->new( $RT::SystemUser );
@@ -80,7 +80,7 @@ diag "check moving with a partial map" if $ENV{TEST_VERBOSE};
     }
 }
 
-diag "one way map doesn't work backwards" if $ENV{TEST_VERBOSE};
+diag "one way map doesn't work backwards";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     my ($id, $msg) = $ticket->Create(
diff --git a/t/mail/charsets-outgoing.t b/t/mail/charsets-outgoing.t
index 646c42a..e6513ff 100644
--- a/t/mail/charsets-outgoing.t
+++ b/t/mail/charsets-outgoing.t
@@ -27,13 +27,13 @@ my $queue = RT::Test->load_or_create_queue(
 );
 ok $queue && $queue->id, 'loaded or created queue';
 
-diag "make sure queue has no subject tag" if $ENV{'TEST_VERBOSE'};
+diag "make sure queue has no subject tag";
 {
     my ($status, $msg) = $queue->SetSubjectTag( undef );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
-diag "set intial simple autoreply template" if $ENV{'TEST_VERBOSE'};
+diag "set intial simple autoreply template";
 {
     my $template = RT::Template->new( $RT::SystemUser );
     $template->Load('Autoreply');
@@ -49,7 +49,7 @@ diag "set intial simple autoreply template" if $ENV{'TEST_VERBOSE'};
         or diag "error: $msg";
 }
 
-diag "basic test of autoreply" if $ENV{'TEST_VERBOSE'};
+diag "basic test of autoreply";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
@@ -61,8 +61,7 @@ diag "basic test of autoreply" if $ENV{'TEST_VERBOSE'};
     ok @mails, "got some outgoing emails";
 }
 
-diag "non-ascii Subject with ascii prefix set in the template"
-    if $ENV{'TEST_VERBOSE'};
+diag "non-ascii Subject with ascii prefix set in the template";
 foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
@@ -85,13 +84,13 @@ foreach my $set ( 'ru', 'latin1' ) {
 
 foreach my $tag_set ( 'ru', 'latin1' ) {
 
-diag "set non-ascii subject tag for the queue" if $ENV{'TEST_VERBOSE'};
+diag "set non-ascii subject tag for the queue";
 {
     my ($status, $msg) = $queue->SetSubjectTag( $string{$tag_set}{support} );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
-diag "ascii subject with non-ascii subject tag" if $ENV{'TEST_VERBOSE'};
+diag "ascii subject with non-ascii subject tag";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
@@ -112,7 +111,7 @@ diag "ascii subject with non-ascii subject tag" if $ENV{'TEST_VERBOSE'};
     ok $status, "all mails have correct data";
 }
 
-diag "non-ascii subject with non-ascii subject tag" if $ENV{'TEST_VERBOSE'};
+diag "non-ascii subject with non-ascii subject tag";
 foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
@@ -137,7 +136,7 @@ foreach my $set ( 'ru', 'latin1' ) {
 
 } # subject tag
 
-diag "return back the empty subject tag" if $ENV{'TEST_VERBOSE'};
+diag "return back the empty subject tag";
 {
     my ($status, $msg) = $queue->SetSubjectTag( undef );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
@@ -146,7 +145,7 @@ diag "return back the empty subject tag" if $ENV{'TEST_VERBOSE'};
 
 foreach my $prefix_set ( 'ru', 'latin1' ) {
 
-diag "add non-ascii subject prefix in the autoreply template" if $ENV{'TEST_VERBOSE'};
+diag "add non-ascii subject prefix in the autoreply template";
 {
     my $template = RT::Template->new( $RT::SystemUser );
     $template->Load('Autoreply');
@@ -161,7 +160,7 @@ diag "add non-ascii subject prefix in the autoreply template" if $ENV{'TEST_VERB
     ok $status, "changed content of the template" or diag "error: $msg";
 }
 
-diag "ascii subject with non-ascii subject prefix in template" if $ENV{'TEST_VERBOSE'};
+diag "ascii subject with non-ascii subject prefix in template";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
@@ -182,8 +181,7 @@ diag "ascii subject with non-ascii subject prefix in template" if $ENV{'TEST_VER
     ok $status, "all mails have correct data";
 }
 
-diag "non-ascii subject with non-ascii subject prefix in template"
-    if $ENV{'TEST_VERBOSE'};
+diag "non-ascii subject with non-ascii subject prefix in template";
 foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
@@ -207,14 +205,13 @@ foreach my $set ( 'ru', 'latin1' ) {
 }
 
 foreach my $tag_set ( 'ru', 'latin1' ) {
-diag "set non-ascii subject tag for the queue" if $ENV{'TEST_VERBOSE'};
+diag "set non-ascii subject tag for the queue";
 {
     my ($status, $msg) = $queue->SetSubjectTag( $string{$tag_set}{support} );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
-diag "non-ascii subject, non-ascii prefix in template and non-ascii tag"
-    if $ENV{'TEST_VERBOSE'};
+diag "non-ascii subject, non-ascii prefix in template and non-ascii tag";
 foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
@@ -241,7 +238,7 @@ foreach my $set ( 'ru', 'latin1' ) {
 
 } # subject tag
 
-diag "flush subject tag of the queue" if $ENV{'TEST_VERBOSE'};
+diag "flush subject tag of the queue";
 {
     my ($status, $msg) = $queue->SetSubjectTag( undef );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
@@ -250,7 +247,7 @@ diag "flush subject tag of the queue" if $ENV{'TEST_VERBOSE'};
 } # prefix set
 
 
-diag "don't change subject via template" if $ENV{'TEST_VERBOSE'};
+diag "don't change subject via template";
 # clean DB has autoreply that always changes subject in template,
 # we should test situation when subject is not changed from template
 {
@@ -267,7 +264,7 @@ diag "don't change subject via template" if $ENV{'TEST_VERBOSE'};
     ok $status, "changed content of the template" or diag "error: $msg";
 }
 
-diag "non-ascii Subject without changes in template" if $ENV{'TEST_VERBOSE'};
+diag "non-ascii Subject without changes in template";
 foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
@@ -289,14 +286,13 @@ foreach my $set ( 'ru', 'latin1' ) {
 }
 
 foreach my $tag_set ( 'ru', 'latin1' ) {
-diag "set non-ascii subject tag for the queue" if $ENV{'TEST_VERBOSE'};
+diag "set non-ascii subject tag for the queue";
 {
     my ($status, $msg) = $queue->SetSubjectTag( $string{$tag_set}{support} );
     ok $status, "set subject tag for the queue" or diag "error: $msg";
 }
 
-diag "non-ascii Subject without changes in template and with non-ascii subject tag"
-    if $ENV{'TEST_VERBOSE'};
+diag "non-ascii Subject without changes in template and with non-ascii subject tag";
 foreach my $set ( 'ru', 'latin1' ) {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     $ticket->Create(
diff --git a/t/mail/crypt-gnupg.t b/t/mail/crypt-gnupg.t
index f33fbab..0356099 100644
--- a/t/mail/crypt-gnupg.t
+++ b/t/mail/crypt-gnupg.t
@@ -31,7 +31,7 @@ RT->Config->Set( 'GnuPGOptions',
 );
 
 
-diag 'only signing. correct passphrase' if $ENV{'TEST_VERBOSE'};
+diag 'only signing. correct passphrase';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -67,7 +67,7 @@ diag 'only signing. correct passphrase' if $ENV{'TEST_VERBOSE'};
     is( $status[0]->{'Trust'}, 'ULTIMATE', 'have trust value');
 }
 
-diag 'only signing. missing passphrase' if $ENV{'TEST_VERBOSE'};
+diag 'only signing. missing passphrase';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -84,7 +84,7 @@ diag 'only signing. missing passphrase' if $ENV{'TEST_VERBOSE'};
     is( $status[0]->{'Status'}, 'MISSING', 'missing passphrase');
 }
 
-diag 'only signing. wrong passphrase' if $ENV{'TEST_VERBOSE'};
+diag 'only signing. wrong passphrase';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -101,7 +101,7 @@ diag 'only signing. wrong passphrase' if $ENV{'TEST_VERBOSE'};
     is( $status[0]->{'Status'}, 'BAD', 'wrong passphrase');
 }
 
-diag 'encryption only' if $ENV{'TEST_VERBOSE'};
+diag 'encryption only';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -127,7 +127,7 @@ diag 'encryption only' if $ENV{'TEST_VERBOSE'};
     is( $parts[0]->{'Top'}, $entity, "it's the same entity" );
 }
 
-diag 'encryption only, bad recipient' if $ENV{'TEST_VERBOSE'};
+diag 'encryption only, bad recipient';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -144,7 +144,7 @@ diag 'encryption only, bad recipient' if $ENV{'TEST_VERBOSE'};
     is( $status[0]->{'Keyword'}, 'INV_RECP', 'invalid recipient');
 }
 
-diag 'encryption and signing with combined method' if $ENV{'TEST_VERBOSE'};
+diag 'encryption and signing with combined method';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -174,7 +174,7 @@ diag 'encryption and signing with combined method' if $ENV{'TEST_VERBOSE'};
     is( $parts[0]->{'Top'}, $entity, "it's the same entity" );
 }
 
-diag 'encryption and signing with cascading, sign on encrypted' if $ENV{'TEST_VERBOSE'};
+diag 'encryption and signing with cascading, sign on encrypted';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -196,7 +196,7 @@ diag 'encryption and signing with cascading, sign on encrypted' if $ENV{'TEST_VE
     is( $parts[0]->{'Top'}, $entity, "it's the same entity" );
 }
 
-diag 'find signed/encrypted part deep inside' if $ENV{'TEST_VERBOSE'};
+diag 'find signed/encrypted part deep inside';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -219,7 +219,7 @@ diag 'find signed/encrypted part deep inside' if $ENV{'TEST_VERBOSE'};
     is( $parts[0]->{'Top'}, $entity->parts(0), "it's the same entity" );
 }
 
-diag 'wrong signed/encrypted parts: no protocol' if $ENV{'TEST_VERBOSE'};
+diag 'wrong signed/encrypted parts: no protocol';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -235,7 +235,7 @@ diag 'wrong signed/encrypted parts: no protocol' if $ENV{'TEST_VERBOSE'};
     is( scalar @parts, 0, 'no protected parts' );
 }
 
-diag 'wrong signed/encrypted parts: not enought parts' if $ENV{'TEST_VERBOSE'};
+diag 'wrong signed/encrypted parts: not enought parts';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -251,7 +251,7 @@ diag 'wrong signed/encrypted parts: not enought parts' if $ENV{'TEST_VERBOSE'};
     is( scalar @parts, 0, 'no protected parts' );
 }
 
-diag 'wrong signed/encrypted parts: wrong proto' if $ENV{'TEST_VERBOSE'};
+diag 'wrong signed/encrypted parts: wrong proto';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -267,7 +267,7 @@ diag 'wrong signed/encrypted parts: wrong proto' if $ENV{'TEST_VERBOSE'};
     is( scalar @parts, 0, 'no protected parts' );
 }
 
-diag 'wrong signed/encrypted parts: wrong proto' if $ENV{'TEST_VERBOSE'};
+diag 'wrong signed/encrypted parts: wrong proto';
 {
     my $entity = MIME::Entity->build(
         From    => 'rt at example.com',
@@ -283,7 +283,7 @@ diag 'wrong signed/encrypted parts: wrong proto' if $ENV{'TEST_VERBOSE'};
     is( scalar @parts, 0, 'no protected parts' );
 }
 
-diag 'verify inline and in attachment signatures' if $ENV{'TEST_VERBOSE'};
+diag 'verify inline and in attachment signatures';
 {
     open my $fh, "$homedir/signed_old_style_with_attachment.eml";
     my $parser = new MIME::Parser;
diff --git a/t/mail/extractsubjecttag.t b/t/mail/extractsubjecttag.t
index 147efff..527297d 100644
--- a/t/mail/extractsubjecttag.t
+++ b/t/mail/extractsubjecttag.t
@@ -17,7 +17,7 @@ my $queue = RT::Test->load_or_create_queue(
 my $subject_tag = 'Windows/Servers-Desktops';
 ok $queue && $queue->id, 'loaded or created queue';
 
-diag "Set Subject Tag" if $ENV{'TEST_VERBOSE'};
+diag "Set Subject Tag";
 {
     is(RT->System->SubjectTag($queue), undef, 'No Subject Tag yet');
     my ($status, $msg) = $queue->SetSubjectTag( $subject_tag );
@@ -26,7 +26,7 @@ diag "Set Subject Tag" if $ENV{'TEST_VERBOSE'};
 }
 
 my $original_ticket = RT::Ticket->new( $RT::SystemUser );
-diag "Create a ticket and make sure it has the subject tag" if $ENV{'TEST_VERBOSE'};
+diag "Create a ticket and make sure it has the subject tag";
 {
     $original_ticket->Create(
         Queue => $queue->id,
@@ -47,7 +47,7 @@ diag "Create a ticket and make sure it has the subject tag" if $ENV{'TEST_VERBOS
 }
 
 
-diag "Test that a reply with a Subject Tag doesn't change the subject" if $ENV{'TEST_VERBOSE'};
+diag "Test that a reply with a Subject Tag doesn't change the subject";
 {
     my $ticketid = $original_ticket->Id;
     my $text = <<EOF;
@@ -67,7 +67,7 @@ EOF
 
 }
 
-diag "Test that a reply with another RT's subject tag changes the subject" if $ENV{'TEST_VERBOSE'};
+diag "Test that a reply with another RT's subject tag changes the subject";
 {
     my $ticketid = $original_ticket->Id;
     my $text = <<EOF;
diff --git a/t/mail/gateway.t b/t/mail/gateway.t
index 00de1ec..f22679e 100644
--- a/t/mail/gateway.t
+++ b/t/mail/gateway.t
@@ -70,7 +70,7 @@ use LWP::UserAgent;
 
 my $url = $m->rt_base_url;
 
-diag "Make sure that when we call the mailgate without URL, it fails" if $ENV{'TEST_VERBOSE'};
+diag "Make sure that when we call the mailgate without URL, it fails";
 {
     my $text = <<EOF;
 From: root\@localhost
@@ -84,7 +84,7 @@ EOF
     ok (!$id, "No ticket id") or diag "by mistake ticket #$id";
 }
 
-diag "Make sure that when we call the mailgate with wrong URL, it tempfails" if $ENV{'TEST_VERBOSE'};
+diag "Make sure that when we call the mailgate with wrong URL, it tempfails";
 {
     my $text = <<EOF;
 From: root\@localhost
@@ -99,7 +99,7 @@ EOF
 }
 
 my $everyone_group;
-diag "revoke rights tests depend on" if $ENV{'TEST_VERBOSE'};
+diag "revoke rights tests depend on";
 {
     $everyone_group = RT::Group->new( $RT::SystemUser );
     $everyone_group->LoadSystemInternalGroup( 'Everyone' );
@@ -110,7 +110,7 @@ diag "revoke rights tests depend on" if $ENV{'TEST_VERBOSE'};
     }
 }
 
-diag "Test new ticket creation by root who is privileged and superuser" if $ENV{'TEST_VERBOSE'};
+diag "Test new ticket creation by root who is privileged and superuser";
 {
     my $text = <<EOF;
 From: root\@localhost
@@ -131,7 +131,7 @@ EOF
     is ($tick->Subject , 'This is a test of new ticket creation', "Created the ticket");
 }
 
-diag "Test the 'X-RT-Mail-Extension' field in the header of a ticket" if $ENV{'TEST_VERBOSE'};
+diag "Test the 'X-RT-Mail-Extension' field in the header of a ticket";
 {
     my $text = <<EOF;
 From: root\@localhost
@@ -167,7 +167,7 @@ EOF
     );
 }
 
-diag "Make sure that not standard --extension is passed" if $ENV{'TEST_VERBOSE'};
+diag "Make sure that not standard --extension is passed";
 {
     my $text = <<EOF;
 From: root\@localhost
@@ -200,7 +200,7 @@ EOF
     );
 }
 
-diag "Test new ticket creation without --action argument" if $ENV{'TEST_VERBOSE'};
+diag "Test new ticket creation without --action argument";
 {
     my $text = <<EOF;
 From: root\@localhost
@@ -220,7 +220,7 @@ EOF
     is ($tick->Subject, 'using mailgate without --action arg', "using mailgate without --action arg");
 }
 
-diag "This is a test of new ticket creation as an unknown user" if $ENV{'TEST_VERBOSE'};
+diag "This is a test of new ticket creation as an unknown user";
 {
     my $text = <<EOF;
 From: doesnotexist\@@{[RT->Config->Get('rtname')]}
@@ -244,7 +244,7 @@ EOF
     ok( !$u->Id, "user does not exist and was not created by failed ticket submission");
 }
 
-diag "grant everybody with CreateTicket right" if $ENV{'TEST_VERBOSE'};
+diag "grant everybody with CreateTicket right";
 {
     ok( RT::Test->set_rights(
         { Principal => $everyone_group->PrincipalObj,
@@ -254,7 +254,7 @@ diag "grant everybody with CreateTicket right" if $ENV{'TEST_VERBOSE'};
 }
 
 my $ticket_id;
-diag "now everybody can create tickets. can a random unkown user create tickets?" if $ENV{'TEST_VERBOSE'};
+diag "now everybody can create tickets. can a random unkown user create tickets?";
 {
     my $text = <<EOF;
 From: doesnotexist\@@{[RT->Config->Get('rtname')]}
@@ -280,7 +280,7 @@ EOF
     $ticket_id = $id;
 }
 
-diag "can another random reply to a ticket without being granted privs? answer should be no." if $ENV{'TEST_VERBOSE'};
+diag "can another random reply to a ticket without being granted privs? answer should be no.";
 {
     my $text = <<EOF;
 From: doesnotexist-2\@@{[RT->Config->Get('rtname')]}
@@ -299,7 +299,7 @@ EOF
     ok( !$u->Id, " user does not exist and was not created by ticket correspondence submission");
 }
 
-diag "grant everyone 'ReplyToTicket' right" if $ENV{'TEST_VERBOSE'};
+diag "grant everyone 'ReplyToTicket' right";
 {
     ok( RT::Test->set_rights(
         { Principal => $everyone_group->PrincipalObj,
@@ -308,7 +308,7 @@ diag "grant everyone 'ReplyToTicket' right" if $ENV{'TEST_VERBOSE'};
     ), "Granted everybody the right to reply to tickets" );
 }
 
-diag "can another random reply to a ticket after being granted privs? answer should be yes" if $ENV{'TEST_VERBOSE'};
+diag "can another random reply to a ticket after being granted privs? answer should be yes";
 {
     my $text = <<EOF;
 From: doesnotexist-2\@@{[RT->Config->Get('rtname')]}
@@ -327,7 +327,7 @@ EOF
     ok ($u->Id, "user exists and was created by ticket correspondence submission");
 }
 
-diag "add a reply to the ticket using '--extension ticket' feature" if $ENV{'TEST_VERBOSE'};
+diag "add a reply to the ticket using '--extension ticket' feature";
 {
     my $text = <<EOF;
 From: doesnotexist-2\@@{[RT->Config->Get('rtname')]}
@@ -359,7 +359,7 @@ EOF
     is ($attachment->GetHeader('X-RT-Mail-Extension'), $id, 'header is in place');
 }
 
-diag "can another random comment on a ticket without being granted privs? answer should be no" if $ENV{'TEST_VERBOSE'};
+diag "can another random comment on a ticket without being granted privs? answer should be no";
 {
     my $text = <<EOF;
 From: doesnotexist-3\@@{[RT->Config->Get('rtname')]}
@@ -379,7 +379,7 @@ EOF
 }
 
 
-diag "grant everyone 'CommentOnTicket' right" if $ENV{'TEST_VERBOSE'};
+diag "grant everyone 'CommentOnTicket' right";
 {
     ok( RT::Test->set_rights(
         { Principal => $everyone_group->PrincipalObj,
@@ -388,7 +388,7 @@ diag "grant everyone 'CommentOnTicket' right" if $ENV{'TEST_VERBOSE'};
     ), "Granted everybody the right to comment on tickets");
 }
 
-diag "can another random reply to a ticket after being granted privs? answer should be yes" if $ENV{'TEST_VERBOSE'};
+diag "can another random reply to a ticket after being granted privs? answer should be yes";
 {
     my $text = <<EOF;
 From: doesnotexist-3\@@{[RT->Config->Get('rtname')]}
@@ -407,7 +407,7 @@ EOF
     ok ($u->Id, " user exists and was created by ticket comment submission");
 }
 
-diag "add comment to the ticket using '--extension action' feature" if $ENV{'TEST_VERBOSE'};
+diag "add comment to the ticket using '--extension action' feature";
 {
     my $text = <<EOF;
 From: doesnotexist-3\@@{[RT->Config->Get('rtname')]}
@@ -444,7 +444,7 @@ EOF
     is ($attachment->GetHeader('X-RT-Mail-Extension'), 'comment', 'header is in place');
 }
 
-diag "Testing preservation of binary attachments" if $ENV{'TEST_VERBOSE'};
+diag "Testing preservation of binary attachments";
 {
     # Get a binary blob (Best Practical logo) 
     my $LOGO_FILE = $RT::MasonComponentRoot .'/NoAuth/images/bplogo.gif';
@@ -475,7 +475,7 @@ diag "Testing preservation of binary attachments" if $ENV{'TEST_VERBOSE'};
 
     my $file = `cat $LOGO_FILE`;
     ok ($file, "Read in the logo image");
-    diag "for the raw file the md5 hex is ". Digest::MD5::md5_hex($file) if $ENV{'TEST_VERBOSE'};
+    diag "for the raw file the md5 hex is ". Digest::MD5::md5_hex($file);
 
     # Verify that the binary attachment is valid in the database
     my $attachments = RT::Attachments->new($RT::SystemUser);
@@ -493,7 +493,7 @@ diag "Testing preservation of binary attachments" if $ENV{'TEST_VERBOSE'};
     ok ($attachment->Id, 'loaded attachment object');
     my $acontent = $attachment->Content;
 
-    diag "coming from the database, md5 hex is ".Digest::MD5::md5_hex($acontent) if $ENV{'TEST_VERBOSE'};
+    diag "coming from the database, md5 hex is ".Digest::MD5::md5_hex($acontent);
     is ($acontent, $file, 'The attachment isn\'t screwed up in the database.');
 
     # Grab the binary attachment via the web ui
@@ -506,7 +506,7 @@ diag "Testing preservation of binary attachments" if $ENV{'TEST_VERBOSE'};
     is ($file, $r->content, 'The attachment isn\'t screwed up in download');
 }
 
-diag "Simple I18N testing" if $ENV{'TEST_VERBOSE'};
+diag "Simple I18N testing";
 {
     my $text = <<EOF;
 From: root\@localhost
@@ -542,7 +542,7 @@ EOF
     );
 }
 
-diag "supposedly I18N fails on the second message sent in." if $ENV{'TEST_VERBOSE'};
+diag "supposedly I18N fails on the second message sent in.";
 {
     my $text = <<EOF;
 From: root\@localhost
@@ -574,7 +574,7 @@ EOF
     );
 }
 
-diag "check that mailgate doesn't suffer from empty Reply-To:" if $ENV{'TEST_VERBOSE'};
+diag "check that mailgate doesn't suffer from empty Reply-To:";
 {
     my $text = <<EOF;
 From: root\@localhost
diff --git a/t/mail/gnupg-bad.t b/t/mail/gnupg-bad.t
index 2d8e035..a3a2775 100644
--- a/t/mail/gnupg-bad.t
+++ b/t/mail/gnupg-bad.t
@@ -42,17 +42,17 @@ $user->SetEmailAddress('rt at example.com');
 
 if (0) {
     # XXX: need to generate these mails
-    diag "no signature" if $ENV{TEST_VERBOSE};
-    diag "no encryption on encrypted queue" if $ENV{TEST_VERBOSE};
-    diag "mismatched signature" if $ENV{TEST_VERBOSE};
-    diag "unknown public key" if $ENV{TEST_VERBOSE};
-    diag "unknown private key" if $ENV{TEST_VERBOSE};
-    diag "signer != sender" if $ENV{TEST_VERBOSE};
-    diag "encryption to user whose pubkey is not signed" if $ENV{TEST_VERBOSE};
-    diag "no encryption of attachment on encrypted queue" if $ENV{TEST_VERBOSE};
-    diag "no signature of attachment" if $ENV{TEST_VERBOSE};
-    diag "revoked key" if $ENV{TEST_VERBOSE};
-    diag "expired key" if $ENV{TEST_VERBOSE};
-    diag "unknown algorithm" if $ENV{TEST_VERBOSE};
+    diag "no signature";
+    diag "no encryption on encrypted queue";
+    diag "mismatched signature";
+    diag "unknown public key";
+    diag "unknown private key";
+    diag "signer != sender";
+    diag "encryption to user whose pubkey is not signed";
+    diag "no encryption of attachment on encrypted queue";
+    diag "no signature of attachment";
+    diag "revoked key";
+    diag "expired key";
+    diag "unknown algorithm";
 }
 
diff --git a/t/mail/gnupg-realmail.t b/t/mail/gnupg-realmail.t
index a6f1365..9ee4024 100644
--- a/t/mail/gnupg-realmail.t
+++ b/t/mail/gnupg-realmail.t
@@ -48,7 +48,7 @@ for my $usage (qw/signed encrypted signed&encrypted/) {
     for my $format (qw/MIME inline/) {
         for my $attachment (qw/plain text-attachment binary-attachment/) {
             ++$eid;
-            diag "Email $eid: $usage, $attachment email with $format format" if $ENV{TEST_VERBOSE};
+            diag "Email $eid: $usage, $attachment email with $format format";
             eval { email_ok($eid, $usage, $format, $attachment) };
         }
     }
@@ -58,13 +58,13 @@ $eid = 18;
 {
     my ($usage, $format, $attachment) = ('signed', 'inline', 'plain');
     ++$eid;
-    diag "Email $eid: $usage, $attachment email with $format format" if $ENV{TEST_VERBOSE};
+    diag "Email $eid: $usage, $attachment email with $format format";
     eval { email_ok($eid, $usage, $format, $attachment) };
 }
 
 sub email_ok {
     my ($eid, $usage, $format, $attachment) = @_;
-    diag "email_ok $eid: $usage, $format, $attachment" if $ENV{'TEST_VERBOSE'};
+    diag "email_ok $eid: $usage, $format, $attachment";
 
     my $emaildatadir = RT::Test::get_relocatable_dir(File::Spec->updir(),
         qw(data gnupg emails));
diff --git a/t/mail/gnupg-reverification.t b/t/mail/gnupg-reverification.t
index f116d93..9fc9ad3 100644
--- a/t/mail/gnupg-reverification.t
+++ b/t/mail/gnupg-reverification.t
@@ -25,7 +25,7 @@ RT->Config->Set( 'GnuPGOptions',
 RT->Config->Set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
 
 
-diag "load Everyone group" if $ENV{'TEST_VERBOSE'};
+diag "load Everyone group";
 my $everyone;
 {
     $everyone = RT::Group->new( $RT::SystemUser );
@@ -50,7 +50,7 @@ my $emaildatadir = RT::Test::get_relocatable_dir(File::Spec->updir(),
     qw(data gnupg emails));
 my @files = glob("$emaildatadir/*-signed-*");
 foreach my $file ( @files ) {
-    diag "testing $file" if $ENV{'TEST_VERBOSE'};
+    diag "testing $file";
 
     my ($eid) = ($file =~ m{(\d+)[^/\\]+$});
     ok $eid, 'figured id of a file';
@@ -77,11 +77,11 @@ foreach my $file ( @files ) {
     push @ticket_ids, $id;
 }
 
-diag "import key into keyring" if $ENV{'TEST_VERBOSE'};
+diag "import key into keyring";
 RT::Test->import_gnupg_key('rt-test at example.com', 'public');
 
 foreach my $id ( @ticket_ids ) {
-    diag "testing ticket #$id" if $ENV{'TEST_VERBOSE'};
+    diag "testing ticket #$id";
 
     $m->goto_ticket( $id );
     $m->content_like(
diff --git a/t/mail/mime_decoding.t b/t/mail/mime_decoding.t
index 7e48046..b0093c5 100644
--- a/t/mail/mime_decoding.t
+++ b/t/mail/mime_decoding.t
@@ -5,7 +5,7 @@ use RT::Test nodata => 1, tests => 7;
 
 use_ok('RT::I18N');
 
-diag q{'=' char in a leading part before an encoded part} if $ENV{TEST_VERBOSE};
+diag q{'=' char in a leading part before an encoded part};
 {
     my $str = 'key="plain"; key="=?UTF-8?B?0LzQvtC5X9GE0LDQudC7LmJpbg==?="';
     is(
@@ -15,8 +15,7 @@ diag q{'=' char in a leading part before an encoded part} if $ENV{TEST_VERBOSE};
     );
 }
 
-diag q{not compliant with standards, but MUAs send such field when attachment has non-ascii in name}
-    if $ENV{TEST_VERBOSE};
+diag q{not compliant with standards, but MUAs send such field when attachment has non-ascii in name};
 {
     my $str = 'attachment; filename="=?UTF-8?B?0LzQvtC5X9GE0LDQudC7LmJpbg==?="';
     is(
@@ -26,7 +25,7 @@ diag q{not compliant with standards, but MUAs send such field when attachment ha
     );
 }
 
-diag q{'=' char in a trailing part after an encoded part} if $ENV{TEST_VERBOSE};
+diag q{'=' char in a trailing part after an encoded part};
 {
     my $str = 'attachment; filename="=?UTF-8?B?0LzQvtC5X9GE0LDQudC7LmJpbg==?="; some_prop="value"';
     is(
@@ -36,7 +35,7 @@ diag q{'=' char in a trailing part after an encoded part} if $ENV{TEST_VERBOSE};
     );
 }
 
-diag q{regression test for #5248 from rt3.fsck.com} if $ENV{TEST_VERBOSE};
+diag q{regression test for #5248 from rt3.fsck.com};
 {
     my $str = qq{Subject: =?ISO-8859-1?Q?Re=3A_=5BXXXXXX=23269=5D_=5BComment=5D_Frag?=}
         . qq{\n =?ISO-8859-1?Q?e_zu_XXXXXX--xxxxxx_/_Xxxxx=FCxxxxxxxxxx?=};
@@ -47,7 +46,7 @@ diag q{regression test for #5248 from rt3.fsck.com} if $ENV{TEST_VERBOSE};
     );
 }
 
-diag q{newline and encoded file name} if $ENV{TEST_VERBOSE};
+diag q{newline and encoded file name};
 {
     my $str = qq{application/vnd.ms-powerpoint;\n\tname="=?ISO-8859-1?Q?Main_presentation.ppt?="};
     is(
@@ -57,7 +56,7 @@ diag q{newline and encoded file name} if $ENV{TEST_VERBOSE};
     );
 }
 
-diag q{rfc2231} if $ENV{TEST_VERBOSE};
+diag q{rfc2231};
 {
     my $str =
 "filename*=ISO-8859-1''%74%E9%73%74%2E%74%78%74 filename*=ISO-8859-1''%74%E9%73%74%2E%74%78%74";
diff --git a/t/mail/outlook.t b/t/mail/outlook.t
index 15bfa21..836920a 100644
--- a/t/mail/outlook.t
+++ b/t/mail/outlook.t
@@ -60,7 +60,7 @@ use RT::Test tests => 43;
 my ($baseurl, $m) = RT::Test->started_ok;
 # 12.0 is outlook 2007, 14.0 is 2010
 for my $mailer ( 'Microsoft Office Outlook 12.0', 'Microsoft Outlook 14.0' ) {
-    diag "Test mail with multipart/alternative" if $ENV{'TEST_VERBOSE'};
+    diag "Test mail with multipart/alternative";
     {
         my $text = <<EOF;
 From: root\@localhost
@@ -106,8 +106,7 @@ EOF
             $mailer . ' with multipart/alternative, \n\n are replaced' );
     }
 
-    diag "Test mail with multipart/mixed, with multipart/alternative in it"
-      if $ENV{'TEST_VERBOSE'};
+    diag "Test mail with multipart/mixed, with multipart/alternative in it";
     {
         my $text = <<EOF;
 From: root\@localhost
@@ -167,8 +166,7 @@ EOF
             $mailer . ' with multipart/multipart, \n\n are replaced' );
     }
 
-    diag "Test mail with with outlook, but the content type is text/plain"
-      if $ENV{'TEST_VERBOSE'};
+    diag "Test mail with with outlook, but the content type is text/plain";
     {
         my $text = <<EOF;
 From: root\@localhost
@@ -203,8 +201,7 @@ EOF
     }
 }
 
-diag "Test mail with with multipart/alternative but x-mailer is not outlook "
-  if $ENV{'TEST_VERBOSE'};
+diag "Test mail with with multipart/alternative but x-mailer is not outlook ";
 {
     my $text = <<EOF;
 From: root\@localhost
diff --git a/t/mail/sendmail.t b/t/mail/sendmail.t
index 7b6db93..539cf9e 100644
--- a/t/mail/sendmail.t
+++ b/t/mail/sendmail.t
@@ -505,7 +505,7 @@ like ($cc , qr/test5/, "Found test 5");
 
 # }}}
 
-diag q{regression test for #5248 from rt3.fsck.com} if $ENV{TEST_VERBOSE};
+diag q{regression test for #5248 from rt3.fsck.com};
 {
     my $subject_folding_email = RT::Test::get_relocatable_file(
         'subject-with-folding-ws', (File::Spec->updir(), 'data', 'emails'));
@@ -518,7 +518,7 @@ diag q{regression test for #5248 from rt3.fsck.com} if $ENV{TEST_VERBOSE};
     is ($ticket->Subject, 'test', 'correct subject');
 }
 
-diag q{regression test for #5248 from rt3.fsck.com} if $ENV{TEST_VERBOSE};
+diag q{regression test for #5248 from rt3.fsck.com};
 {
     my $long_subject_email = RT::Test::get_relocatable_file('very-long-subject',
         (File::Spec->updir(), 'data', 'emails'));
diff --git a/t/shredder/02queue.t b/t/shredder/02queue.t
index 197cf63..8e3abf3 100644
--- a/t/shredder/02queue.t
+++ b/t/shredder/02queue.t
@@ -15,7 +15,7 @@ BEGIN {
 init_db();
 
 
-diag 'simple queue' if $ENV{'TEST_VERBOSE'};
+diag 'simple queue' if $ENV{TEST_VERBOSE};
 {
 	create_savepoint('clean');
     my $queue = RT::Queue->new( $RT::SystemUser );
@@ -28,7 +28,7 @@ diag 'simple queue' if $ENV{'TEST_VERBOSE'};
 	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
-diag 'queue with scrip' if $ENV{'TEST_VERBOSE'};
+diag 'queue with scrip' if $ENV{TEST_VERBOSE};
 {
 	create_savepoint('clean');
     my $queue = RT::Queue->new( $RT::SystemUser );
@@ -51,7 +51,7 @@ diag 'queue with scrip' if $ENV{'TEST_VERBOSE'};
 	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
-diag 'queue with template' if $ENV{'TEST_VERBOSE'};
+diag 'queue with template' if $ENV{TEST_VERBOSE};
 {
 	create_savepoint('clean');
     my $queue = RT::Queue->new( $RT::SystemUser );
@@ -72,7 +72,7 @@ diag 'queue with template' if $ENV{'TEST_VERBOSE'};
 	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
-diag 'queue with a right granted' if $ENV{'TEST_VERBOSE'};
+diag 'queue with a right granted' if $ENV{TEST_VERBOSE};
 {
 	create_savepoint('clean');
     my $queue = RT::Queue->new( $RT::SystemUser );
@@ -95,7 +95,7 @@ diag 'queue with a right granted' if $ENV{'TEST_VERBOSE'};
 	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
-diag 'queue with a watcher' if $ENV{'TEST_VERBOSE'};
+diag 'queue with a watcher' if $ENV{TEST_VERBOSE};
 {
 # XXX, FIXME: if uncomment these lines then we'll get 'Bizarre...'
 #	create_savepoint('clean');
diff --git a/t/shredder/02template.t b/t/shredder/02template.t
index d4c323e..14bda86 100644
--- a/t/shredder/02template.t
+++ b/t/shredder/02template.t
@@ -15,7 +15,7 @@ BEGIN {
 init_db();
 
 
-diag 'global template' if $ENV{'TEST_VERBOSE'};
+diag 'global template' if $ENV{TEST_VERBOSE};
 {
 	create_savepoint('clean');
     my $template = RT::Template->new( $RT::SystemUser );
@@ -31,7 +31,7 @@ diag 'global template' if $ENV{'TEST_VERBOSE'};
 	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
-diag 'local template' if $ENV{'TEST_VERBOSE'};
+diag 'local template' if $ENV{TEST_VERBOSE};
 {
 	create_savepoint('clean');
     my $template = RT::Template->new( $RT::SystemUser );
@@ -48,7 +48,7 @@ diag 'local template' if $ENV{'TEST_VERBOSE'};
 	cmp_deeply( dump_current_and_savepoint('clean'), "current DB equal to savepoint");
 }
 
-diag 'template used in scrip' if $ENV{'TEST_VERBOSE'};
+diag 'template used in scrip' if $ENV{TEST_VERBOSE};
 {
 	create_savepoint('clean');
     my $template = RT::Template->new( $RT::SystemUser );
diff --git a/t/ticket/cfsort-freeform-multiple.t b/t/ticket/cfsort-freeform-multiple.t
index f8f5950..f432181 100644
--- a/t/ticket/cfsort-freeform-multiple.t
+++ b/t/ticket/cfsort-freeform-multiple.t
@@ -11,7 +11,7 @@ use RT::CustomField;
 
 # Test Sorting by custom fields.
 
-diag "Create a queue to test with." if $ENV{TEST_VERBOSE};
+diag "Create a queue to test with.";
 my $queue_name = "CFSortQueue-$$";
 my $queue;
 {
@@ -23,7 +23,7 @@ my $queue;
     ok($ret, "$queue_name - test queue creation. $msg");
 }
 
-diag "create a CF\n" if $ENV{TEST_VERBOSE};
+diag "create a CF";
 my $cf_name = "Order$$";
 my $cf;
 {
diff --git a/t/ticket/cfsort-freeform-single.t b/t/ticket/cfsort-freeform-single.t
index f1f506b..e0fd444 100644
--- a/t/ticket/cfsort-freeform-single.t
+++ b/t/ticket/cfsort-freeform-single.t
@@ -11,7 +11,7 @@ use RT::CustomField;
 
 # Test Sorting by FreeformSingle custom field.
 
-diag "Create a queue to test with." if $ENV{TEST_VERBOSE};
+diag "Create a queue to test with.";
 my $queue_name = "CFSortQueue-$$";
 my $queue;
 {
@@ -27,7 +27,7 @@ my $queue;
 my %CF;
 my $cf_name;
 
-diag "create a CF\n" if $ENV{TEST_VERBOSE};
+diag "create a CF";
 {
     $cf_name = $CF{'CF'}{'name'} = "Order$$";
     $CF{'CF'}{'obj'} = RT::CustomField->new( $RT::SystemUser );
@@ -159,7 +159,7 @@ run_tests();
 
 
 
-diag "create another CF\n" if $ENV{TEST_VERBOSE};
+diag "create another CF";
 {
     $CF{'AnotherCF'}{'name'} = "OrderAnother$$";
     $CF{'AnotherCF'}{'obj'} = RT::CustomField->new( $RT::SystemUser );
diff --git a/t/ticket/deferred_owner.t b/t/ticket/deferred_owner.t
index 40172ca..917bbcd 100644
--- a/t/ticket/deferred_owner.t
+++ b/t/ticket/deferred_owner.t
@@ -20,7 +20,7 @@ my $owner_role_group = RT::Group->new( $RT::SystemUser );
 $owner_role_group->LoadQueueRoleGroup( Type => 'Owner', Queue => $queue->id );
 ok $owner_role_group->id, 'loaded owners role group of the queue';
 
-diag "check that deffering owner doesn't regress" if $ENV{'TEST_VERBOSE'};
+diag "check that deffering owner doesn't regress";
 {
     RT::Test->set_rights(
         { Principal => $tester->PrincipalObj,
@@ -39,14 +39,13 @@ diag "check that deffering owner doesn't regress" if $ENV{'TEST_VERBOSE'};
         Owner   => $tester->id,
         AdminCc => 'root at localhost',
     );
-    diag $msg if $msg && $ENV{'TEST_VERBOSE'};
+    diag $msg if $msg;
     ok $tid, "created a ticket";
     is $ticket->Owner, $tester->id, 'correct owner';
     like $ticket->AdminCcAddresses, qr/root\@localhost/, 'root is there';
 }
 
-diag "check that previous trick doesn't work without sufficient rights"
-    if $ENV{'TEST_VERBOSE'};
+diag "check that previous trick doesn't work without sufficient rights";
 {
     RT::Test->set_rights(
         { Principal => $tester->PrincipalObj,
@@ -61,13 +60,13 @@ diag "check that previous trick doesn't work without sufficient rights"
         Owner   => $tester->id,
         AdminCc => 'root at localhost',
     );
-    diag $msg if $msg && $ENV{'TEST_VERBOSE'};
+    diag $msg if $msg;
     ok $tid, "created a ticket";
     is $ticket->Owner, $tester->id, 'correct owner';
     unlike $ticket->AdminCcAddresses, qr/root\@localhost/, 'root is there';
 }
 
-diag "check that deffering owner really works" if $ENV{'TEST_VERBOSE'};
+diag "check that deffering owner really works";
 {
     RT::Test->set_rights(
         { Principal => $tester->PrincipalObj,
@@ -85,13 +84,13 @@ diag "check that deffering owner really works" if $ENV{'TEST_VERBOSE'};
         Owner => $tester->id,
         Cc    => 'tester at localhost',
     );
-    diag $msg if $msg && $ENV{'TEST_VERBOSE'};
+    diag $msg if $msg;
     ok $tid, "created a ticket";
     like $ticket->CcAddresses, qr/tester\@localhost/, 'tester is in the cc list';
     is $ticket->Owner, $tester->id, 'tester is also owner';
 }
 
-diag "check that deffering doesn't work without correct rights" if $ENV{'TEST_VERBOSE'};
+diag "check that deffering doesn't work without correct rights";
 {
     RT::Test->set_rights(
         { Principal => $tester->PrincipalObj,
@@ -110,7 +109,7 @@ diag "check that deffering doesn't work without correct rights" if $ENV{'TEST_VE
         );
     } qr/User .* was proposed as a ticket owner but has no rights to own tickets in General/;
 
-    diag $msg if $msg && $ENV{'TEST_VERBOSE'};
+    diag $msg if $msg;
     ok $tid, "created a ticket";
     like $ticket->CcAddresses, qr/tester\@localhost/, 'tester is in the cc list';
     isnt $ticket->Owner, $tester->id, 'tester is also owner';
diff --git a/t/ticket/linking.t b/t/ticket/linking.t
index 2ea3d58..77eeee0 100644
--- a/t/ticket/linking.t
+++ b/t/ticket/linking.t
@@ -96,7 +96,7 @@ ok ($id,$msg);
 
 my $creator = RT::CurrentUser->new($u1->id);
 
-diag('Create tickets without rights to link') if $ENV{'TEST_VERBOSE'};
+diag('Create tickets without rights to link');
 {
     # on q2 we have no rights, yet
     my $parent = RT::Ticket->new( $RT::SystemUser );
@@ -110,7 +110,7 @@ diag('Create tickets without rights to link') if $ENV{'TEST_VERBOSE'};
     is($child->_Links('Target')->Count, 0, 'link was not create, no permissions');
 }
 
-diag('Create tickets with rights checks on one end of a link') if $ENV{'TEST_VERBOSE'};
+diag('Create tickets with rights checks on one end of a link');
 {
     # on q2 we have no rights, but use checking one only on thing
     RT->Config->Set( StrictLinkACL => 0 );
@@ -131,7 +131,7 @@ diag('Create tickets with rights checks on one end of a link') if $ENV{'TEST_VER
 ($id,$msg) = $u1->PrincipalObj->GrantRight ( Object => $q1, Right => 'ModifyTicket');
 ok ($id,$msg);
 
-diag('try to add link without rights') if $ENV{'TEST_VERBOSE'};
+diag('try to add link without rights');
 {
     # on q2 we have no rights, yet
     my $parent = RT::Ticket->new( $RT::SystemUser );
@@ -148,7 +148,7 @@ diag('try to add link without rights') if $ENV{'TEST_VERBOSE'};
     is($child->_Links('Target')->Count, 0, 'link was not create, no permissions');
 }
 
-diag('add link with rights only on base') if $ENV{'TEST_VERBOSE'};
+diag('add link with rights only on base');
 {
     # on q2 we have no rights, but use checking one only on thing
     RT->Config->Set( StrictLinkACL => 0 );
@@ -193,7 +193,7 @@ ok($ticket->isa('RT::Ticket'));
 ($id,$tid, $msg) = $ticket->Create(Subject => 'Link test 1', Queue => $q1->id);
 ok ($id,$msg);
 
-diag('try link to itself') if $ENV{'TEST_VERBOSE'};
+diag('try link to itself');
 {
     my ($id, $msg) = $ticket->AddLink(Type => 'RefersTo', Target => $ticket->id);
     ok(!$id, $msg);
diff --git a/t/ticket/search_by_cf_freeform_multiple.t b/t/ticket/search_by_cf_freeform_multiple.t
index be51306..5de41b8 100644
--- a/t/ticket/search_by_cf_freeform_multiple.t
+++ b/t/ticket/search_by_cf_freeform_multiple.t
@@ -10,7 +10,7 @@ my $q = RT::Test->load_or_create_queue( Name => 'Regression' );
 ok $q && $q->id, 'loaded or created queue';
 my $queue = $q->Name;
 
-diag "create a CF\n" if $ENV{TEST_VERBOSE};
+diag "create a CF";
 my ($cf_name, $cf_id, $cf) = ("Test", 0, undef);
 {
     $cf = RT::CustomField->new( $RT::SystemUser );
diff --git a/t/ticket/search_by_cf_freeform_single.t b/t/ticket/search_by_cf_freeform_single.t
index d5ff7ec..af0bb7e 100644
--- a/t/ticket/search_by_cf_freeform_single.t
+++ b/t/ticket/search_by_cf_freeform_single.t
@@ -10,7 +10,7 @@ my $q = RT::Test->load_or_create_queue( Name => 'Regression' );
 ok $q && $q->id, 'loaded or created queue';
 my $queue = $q->Name;
 
-diag "create a CF\n" if $ENV{TEST_VERBOSE};
+diag "create a CF";
 my ($cf_name, $cf_id, $cf) = ("Test", 0, undef);
 {
     $cf = RT::CustomField->new( $RT::SystemUser );
diff --git a/t/ticket/sort-by-queue.t b/t/ticket/sort-by-queue.t
index df6e1ad..1edd0c5 100644
--- a/t/ticket/sort-by-queue.t
+++ b/t/ticket/sort-by-queue.t
@@ -14,7 +14,7 @@ use RT::CustomField;
 #########################################################
 
 
-diag "Create queues to test with." if $ENV{TEST_VERBOSE};
+diag "Create queues to test with.";
 my @qids;
 my @queues;
 # create them in reverse order to avoid false positives
diff --git a/t/ticket/sort-by-user.t b/t/ticket/sort-by-user.t
index f9b1602..45fe193 100644
--- a/t/ticket/sort-by-user.t
+++ b/t/ticket/sort-by-user.t
@@ -14,7 +14,7 @@ use RT::CustomField;
 # we sort by user name
 #########################################################
 
-diag "Create a queue to test with." if $ENV{TEST_VERBOSE};
+diag "Create a queue to test with.";
 my $queue_name = "OwnerSortQueue$$";
 my $queue;
 {
diff --git a/t/web/basic.t b/t/web/basic.t
index 3f94e73..338bed9 100644
--- a/t/web/basic.t
+++ b/t/web/basic.t
@@ -10,7 +10,6 @@ $RT::Test::SKIP_REQUEST_WORK_AROUND = 1;
 my ($baseurl, $agent) = RT::Test->started_ok;
 
 my $url = $agent->rt_base_url;
-diag $url if $ENV{TEST_VERBOSE};
 
 # get the top page
 {
diff --git a/t/web/cf_access.t b/t/web/cf_access.t
index 183597b..594bff8 100644
--- a/t/web/cf_access.t
+++ b/t/web/cf_access.t
@@ -11,7 +11,7 @@ use constant ImageFileContent => RT::Test->file_content(ImageFile);
 
 ok $m->login, 'logged in';
 
-diag "Create a CF" if $ENV{'TEST_VERBOSE'};
+diag "Create a CF";
 {
     $m->follow_link( text => 'Configuration' );
     $m->title_is(q/RT Administration/, 'admin screen');
@@ -29,7 +29,7 @@ diag "Create a CF" if $ENV{'TEST_VERBOSE'};
     );
 }
 
-diag "apply the CF to General queue" if $ENV{'TEST_VERBOSE'};
+diag "apply the CF to General queue";
 my ( $cf, $cfid, $tid );
 {
     $m->title_is(q/Created CustomField img/, 'admin-cf created');
@@ -64,8 +64,7 @@ RT::Test->set_rights(
 ok $m->login( $tester->Name, 123456), 'logged in';
 
 diag "check that we have no the CF on the create"
-    ." ticket page when user has no SeeCustomField right"
-        if $ENV{'TEST_VERBOSE'};
+    ." ticket page when user has no SeeCustomField right";
 {
     $m->submit_form(
         form_name => "CreateTicketInQueue",
@@ -95,8 +94,7 @@ RT::Test->set_rights(
 );
 
 diag "check that we have no the CF on the create"
-    ." ticket page when user has no ModifyCustomField right"
-        if $ENV{'TEST_VERBOSE'};
+    ." ticket page when user has no ModifyCustomField right";
 {
     $m->submit_form(
         form_name => "CreateTicketInQueue",
@@ -128,7 +126,7 @@ RT::Test->set_rights(
     },
 );
 
-diag "create a ticket with an image" if $ENV{'TEST_VERBOSE'};
+diag "create a ticket with an image";
 {
     $m->submit_form(
         form_name => "CreateTicketInQueue",
diff --git a/t/web/cf_date.t b/t/web/cf_date.t
index 7e34107..25f18fc 100644
--- a/t/web/cf_date.t
+++ b/t/web/cf_date.t
@@ -13,7 +13,7 @@ ok( $root->Load('root'), 'load root user' );
 my $cf_name = 'test cf date';
 
 my $cfid;
-diag "Create a CF" if $ENV{'TEST_VERBOSE'};
+diag "Create a CF";
 {
     $m->follow_link( text => 'Configuration' );
     $m->title_is( q/RT Administration/, 'admin screen' );
@@ -33,7 +33,7 @@ diag "Create a CF" if $ENV{'TEST_VERBOSE'};
     ok $cfid, "found id of the CF in the form, it's #$cfid";
 }
 
-diag "apply the CF to General queue" if $ENV{'TEST_VERBOSE'};
+diag "apply the CF to General queue";
 my $queue = RT::Test->load_or_create_queue( Name => 'General' );
 ok $queue && $queue->id, 'loaded or created queue';
 
@@ -54,8 +54,7 @@ ok $queue && $queue->id, 'loaded or created queue';
     $m->content_like( qr/Object created/, 'TCF added to the queue' );
 }
 
-diag 'check valid inputs with various timezones in ticket create page'
-  if $ENV{'TEST_VERBOSE'};
+diag 'check valid inputs with various timezones in ticket create page';
 {
     my ( $ticket, $id );
 
@@ -85,7 +84,7 @@ diag 'check valid inputs with various timezones in ticket create page'
         'has cf date value on the page' );
 }
 
-diag 'check search build page' if $ENV{'TEST_VERBOSE'};
+diag 'check search build page';
 {
     $m->get_ok( $baseurl . '/Search/Build.html?Query=Queue=1' );
 
@@ -168,7 +167,7 @@ diag 'check search build page' if $ENV{'TEST_VERBOSE'};
     $m->content_contains( 'Found 0 tickets', 'Found 0 tickets' );
 }
 
-diag 'check invalid inputs' if $ENV{'TEST_VERBOSE'};
+diag 'check invalid inputs';
 {
     $m->submit_form(
         form_name => "CreateTicketInQueue",
diff --git a/t/web/cf_datetime.t b/t/web/cf_datetime.t
index 2d11f53..44146ec 100644
--- a/t/web/cf_datetime.t
+++ b/t/web/cf_datetime.t
@@ -14,7 +14,7 @@ ok( $root->Load('root'), 'load root user' );
 my $cf_name = 'test cf datetime';
 
 my $cfid;
-diag "Create a CF" if $ENV{'TEST_VERBOSE'};
+diag "Create a CF";
 {
     $m->follow_link( text => 'Configuration' );
     $m->title_is(q/RT Administration/, 'admin screen');
@@ -34,7 +34,7 @@ diag "Create a CF" if $ENV{'TEST_VERBOSE'};
     ok $cfid, "found id of the CF in the form, it's #$cfid";
 }
 
-diag "apply the CF to General queue" if $ENV{'TEST_VERBOSE'};
+diag "apply the CF to General queue";
 my $queue = RT::Test->load_or_create_queue( Name => 'General' );
 ok $queue && $queue->id, 'loaded or created queue';
 
@@ -53,7 +53,7 @@ ok $queue && $queue->id, 'loaded or created queue';
     $m->content_like( qr/Object created/, 'TCF added to the queue' );
 }
 
-diag 'check valid inputs with various timezones in ticket create page' if $ENV{'TEST_VERBOSE'};
+diag 'check valid inputs with various timezones in ticket create page';
 {
     my ( $ticket, $id );
 
@@ -120,7 +120,7 @@ diag 'check valid inputs with various timezones in ticket create page' if $ENV{'
 }
 
 
-diag 'check search build page' if $ENV{'TEST_VERBOSE'};
+diag 'check search build page';
 {
     $m->get_ok( $baseurl . '/Search/Build.html?Query=Queue=1' );
 
@@ -214,8 +214,7 @@ diag 'check search build page' if $ENV{'TEST_VERBOSE'};
     $m->content_contains( 'Found 1 ticket', 'Found 1 ticket' );
 }
 
-diag 'check invalid inputs' if $ENV{'TEST_VERBOSE'};
-
+diag 'check invalid inputs';
 {
     $m->submit_form(
         form_name => "CreateTicketInQueue",
diff --git a/t/web/cf_onqueue.t b/t/web/cf_onqueue.t
index bed4dd1..e4be2e3 100644
--- a/t/web/cf_onqueue.t
+++ b/t/web/cf_onqueue.t
@@ -6,7 +6,7 @@ my ($baseurl, $m) = RT::Test->started_ok;
 
 ok $m->login, 'logged in';
 
-diag "Create a queue CF" if $ENV{'TEST_VERBOSE'};
+diag "Create a queue CF";
 {
     $m->follow_link( text => 'Configuration' );
     $m->title_is(q/RT Administration/, 'admin screen');
@@ -25,7 +25,7 @@ diag "Create a queue CF" if $ENV{'TEST_VERBOSE'};
     $m->content_like( qr/Object created/, 'CF QueueCFTest created' );
 }
 
-diag "Apply the new CF globally" if $ENV{'TEST_VERBOSE'};
+diag "Apply the new CF globally";
 {
     $m->follow_link( text => 'Global' );
     $m->title_is(q!Admin/Global configuration!, 'global configuration screen');
@@ -42,7 +42,7 @@ diag "Apply the new CF globally" if $ENV{'TEST_VERBOSE'};
     $m->content_like( qr/Object created/, 'CF QueueCFTest enabled globally' );
 }
 
-diag "Edit the CF value for default queue" if $ENV{'TEST_VERBOSE'};
+diag "Edit the CF value for default queue";
 {
     $m->follow_link( url => '/Admin/Queues/' );
     $m->title_is(q/Admin queues/, 'queues configuration screen');
diff --git a/t/web/cf_select_one.t b/t/web/cf_select_one.t
index 26c1fcf..aa96c17 100644
--- a/t/web/cf_select_one.t
+++ b/t/web/cf_select_one.t
@@ -11,7 +11,7 @@ ok $m->login, 'logged in as root';
 my $cf_name = 'test select one value';
 
 my $cfid;
-diag "Create a CF" if $ENV{'TEST_VERBOSE'};
+diag "Create a CF";
 {
     $m->follow_link( text => 'Configuration' );
     $m->title_is(q/RT Administration/, 'admin screen');
@@ -31,7 +31,7 @@ diag "Create a CF" if $ENV{'TEST_VERBOSE'};
     ok $cfid, "found id of the CF in the form, it's #$cfid";
 }
 
-diag "add 'qwe', 'ASD', '0' and ' foo ' as values to the CF" if $ENV{'TEST_VERBOSE'};
+diag "add 'qwe', 'ASD', '0' and ' foo ' as values to the CF";
 {
     foreach my $value(qw(qwe ASD 0), 'foo ') {
         $m->submit_form(
@@ -52,7 +52,7 @@ diag "add 'qwe', 'ASD', '0' and ' foo ' as values to the CF" if $ENV{'TEST_VERBO
 my $queue = RT::Test->load_or_create_queue( Name => 'General' );
 ok $queue && $queue->id, 'loaded or created queue';
 
-diag "apply the CF to General queue" if $ENV{'TEST_VERBOSE'};
+diag "apply the CF to General queue";
 {
     $m->follow_link( text => 'Queues' );
     $m->title_is(q/Admin queues/, 'admin-queues screen');
@@ -69,8 +69,7 @@ diag "apply the CF to General queue" if $ENV{'TEST_VERBOSE'};
 }
 
 my $tid;
-diag "create a ticket using API with 'asd'(not 'ASD') as value of the CF"
-    if $ENV{'TEST_VERBOSE'};
+diag "create a ticket using API with 'asd'(not 'ASD') as value of the CF";
 {
     my $ticket = RT::Ticket->new( $RT::SystemUser );
     my ($txnid, $msg);
@@ -80,7 +79,7 @@ diag "create a ticket using API with 'asd'(not 'ASD') as value of the CF"
         "CustomField-$cfid" => 'asd',
     );
     ok $tid, "created ticket";
-    diag $msg if $msg && $ENV{'TEST_VERBOSE'};
+    diag $msg if $msg;
 
     # we use lc as we really don't care about case
     # so if later we'll add canonicalization of value
@@ -89,8 +88,7 @@ diag "create a ticket using API with 'asd'(not 'ASD') as value of the CF"
        'asd', 'assigned value of the CF';
 }
 
-diag "check that values of the CF are case insensetive(asd vs. ASD)"
-    if $ENV{'TEST_VERBOSE'};
+diag "check that values of the CF are case insensetive(asd vs. ASD)";
 {
     ok $m->goto_ticket( $tid ), "opened ticket's page";
     $m->follow_link( text => 'Custom Fields' );
@@ -112,8 +110,7 @@ diag "check that values of the CF are case insensetive(asd vs. ASD)"
        'asd', 'value is still the same';
 }
 
-diag "check that 0 is ok value of the CF"
-    if $ENV{'TEST_VERBOSE'};
+diag "check that 0 is ok value of the CF";
 {
     ok $m->goto_ticket( $tid ), "opened ticket's page";
     $m->follow_link( text => 'Custom Fields' );
@@ -137,8 +134,7 @@ diag "check that 0 is ok value of the CF"
        '0', 'API returns correct value';
 }
 
-diag "check that we can set empty value when the current is 0"
-    if $ENV{'TEST_VERBOSE'};
+diag "check that we can set empty value when the current is 0";
 {
     ok $m->goto_ticket( $tid ), "opened ticket's page";
     $m->follow_link( text => 'Custom Fields' );
diff --git a/t/web/compilation_errors.t b/t/web/compilation_errors.t
index 0607e7a..a7945b6 100644
--- a/t/web/compilation_errors.t
+++ b/t/web/compilation_errors.t
@@ -28,7 +28,6 @@ $agent->cookie_jar($cookie_jar);
 
 # get the top page
 my $url = $agent->rt_base_url;
-diag "Base URL is '$url'" if $ENV{TEST_VERBOSE};
 $agent->get($url);
 
 is ($agent->{'status'}, 200, "Loaded a page");
@@ -47,7 +46,7 @@ sub test_get {
         my $file = shift;
 
         $file =~ s#^share/html/##;
-        diag( "testing $url/$file" ) if $ENV{TEST_VERBOSE};
+        diag( "testing $url/$file" );
         ok ($agent->get("$url/$file", "GET $url/$file"), "Can Get $url/$file");
         is ($agent->{'status'}, 200, "Loaded $file");
 #        ok( $agent->{'content'} =~ /Logout/i, "Found a logout link on $file ");
diff --git a/t/web/gnupg-outgoing.t b/t/web/gnupg-outgoing.t
index a46833c..b4a741a 100644
--- a/t/web/gnupg-outgoing.t
+++ b/t/web/gnupg-outgoing.t
@@ -63,7 +63,7 @@ my %mail = (
     signed_encrypted => [],
 );
 
-diag "check in read-only mode that queue's props influence create/update ticket pages" if $ENV{TEST_VERBOSE};
+diag "check in read-only mode that queue's props influence create/update ticket pages";
 {
     foreach my $variant ( @variants ) {
         set_queue_crypt_options( %$variant );
diff --git a/t/web/gnupg-select-keys-on-create.t b/t/web/gnupg-select-keys-on-create.t
index 6bf8591..d05c619 100644
--- a/t/web/gnupg-select-keys-on-create.t
+++ b/t/web/gnupg-select-keys-on-create.t
@@ -27,7 +27,7 @@ RT->Config->Set( GnuPGOptions =>
     passphrase => 'rt-test',
     'no-permission-warning' => undef,
 );
-diag "GnuPG --homedir ". RT->Config->Get('GnuPGOptions')->{'homedir'} if $ENV{TEST_VERBOSE};
+diag "GnuPG --homedir ". RT->Config->Get('GnuPGOptions')->{'homedir'};
 
 RT->Config->Set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
 
@@ -46,7 +46,7 @@ RT::Test->set_rights(
 my ($baseurl, $m) = RT::Test->started_ok;
 ok $m->login, 'logged in';
 
-diag "check that signing doesn't work if there is no key" if $ENV{TEST_VERBOSE};
+diag "check that signing doesn't work if there is no key";
 {
     RT::Test->clean_caught_mails;
 
@@ -72,7 +72,7 @@ diag "check that signing doesn't work if there is no key" if $ENV{TEST_VERBOSE};
     is $res{'info'}[0]{'TrustTerse'}, 'ultimate', 'ultimately trusted key';
 }
 
-diag "check that things don't work if there is no key" if $ENV{TEST_VERBOSE};
+diag "check that things don't work if there is no key";
 {
     RT::Test->clean_caught_mails;
 
@@ -98,7 +98,7 @@ diag "check that things don't work if there is no key" if $ENV{TEST_VERBOSE};
     ok !@mail, 'there are no outgoing emails';
 }
 
-diag "import first key of rt-test\@example.com" if $ENV{TEST_VERBOSE};
+diag "import first key of rt-test\@example.com";
 my $fpr1 = '';
 {
     RT::Test->import_gnupg_key('rt-test at example.com', 'public');
@@ -107,7 +107,7 @@ my $fpr1 = '';
     $fpr1 = $res{'info'}[0]{'Fingerprint'};
 }
 
-diag "check that things still doesn't work if key is not trusted" if $ENV{TEST_VERBOSE};
+diag "check that things still doesn't work if key is not trusted";
 {
     RT::Test->clean_caught_mails;
 
@@ -145,7 +145,7 @@ diag "check that things still doesn't work if key is not trusted" if $ENV{TEST_V
     ok !@mail, 'there are no outgoing emails';
 }
 
-diag "import a second key of rt-test\@example.com" if $ENV{TEST_VERBOSE};
+diag "import a second key of rt-test\@example.com";
 my $fpr2 = '';
 {
     RT::Test->import_gnupg_key('rt-test at example.com.2', 'public');
@@ -154,7 +154,7 @@ my $fpr2 = '';
     $fpr2 = $res{'info'}[2]{'Fingerprint'};
 }
 
-diag "check that things still doesn't work if two keys are not trusted" if $ENV{TEST_VERBOSE};
+diag "check that things still doesn't work if two keys are not trusted";
 {
     RT::Test->clean_caught_mails;
 
@@ -199,7 +199,7 @@ diag "check that things still doesn't work if two keys are not trusted" if $ENV{
     is $res{'info'}[1]{'TrustLevel'}, 0, 'is not trusted key';
 }
 
-diag "check that we see key selector even if only one key is trusted but there are more keys" if $ENV{TEST_VERBOSE};
+diag "check that we see key selector even if only one key is trusted but there are more keys";
 {
     RT::Test->clean_caught_mails;
 
@@ -226,7 +226,7 @@ diag "check that we see key selector even if only one key is trusted but there a
     ok !@mail, 'there are no outgoing emails';
 }
 
-diag "check that key selector works and we can select trusted key" if $ENV{TEST_VERBOSE};
+diag "check that key selector works and we can select trusted key";
 {
     RT::Test->clean_caught_mails;
 
@@ -258,7 +258,7 @@ diag "check that key selector works and we can select trusted key" if $ENV{TEST_
     check_text_emails( { Encrypt => 1 }, @mail );
 }
 
-diag "check encrypting of attachments" if $ENV{TEST_VERBOSE};
+diag "check encrypting of attachments";
 {
     RT::Test->clean_caught_mails;
 
diff --git a/t/web/gnupg-select-keys-on-update.t b/t/web/gnupg-select-keys-on-update.t
index 76817dd..ea4b577 100644
--- a/t/web/gnupg-select-keys-on-update.t
+++ b/t/web/gnupg-select-keys-on-update.t
@@ -27,7 +27,7 @@ RT->Config->Set( GnuPGOptions =>
     passphrase => 'rt-test',
     'no-permission-warning' => undef,
 );
-diag "GnuPG --homedir ". RT->Config->Get('GnuPGOptions')->{'homedir'} if $ENV{TEST_VERBOSE};
+diag "GnuPG --homedir ". RT->Config->Get('GnuPGOptions')->{'homedir'};
 
 RT->Config->Set( 'MailPlugins' => 'Auth::MailFrom', 'Auth::GnuPG' );
 
@@ -57,7 +57,7 @@ my $tid;
     ok $tid, 'ticket created';
 }
 
-diag "check that signing doesn't work if there is no key" if $ENV{TEST_VERBOSE};
+diag "check that signing doesn't work if there is no key";
 {
     RT::Test->clean_caught_mails;
 
@@ -84,7 +84,7 @@ diag "check that signing doesn't work if there is no key" if $ENV{TEST_VERBOSE};
     is $res{'info'}[0]{'TrustTerse'}, 'ultimate', 'ultimately trusted key';
 }
 
-diag "check that things don't work if there is no key" if $ENV{TEST_VERBOSE};
+diag "check that things don't work if there is no key";
 {
     RT::Test->clean_caught_mails;
 
@@ -112,7 +112,7 @@ diag "check that things don't work if there is no key" if $ENV{TEST_VERBOSE};
 }
 
 
-diag "import first key of rt-test\@example.com" if $ENV{TEST_VERBOSE};
+diag "import first key of rt-test\@example.com";
 my $fpr1 = '';
 {
     RT::Test->import_gnupg_key('rt-test at example.com', 'public');
@@ -121,7 +121,7 @@ my $fpr1 = '';
     $fpr1 = $res{'info'}[0]{'Fingerprint'};
 }
 
-diag "check that things still doesn't work if key is not trusted" if $ENV{TEST_VERBOSE};
+diag "check that things still doesn't work if key is not trusted";
 {
     RT::Test->clean_caught_mails;
 
@@ -160,7 +160,7 @@ diag "check that things still doesn't work if key is not trusted" if $ENV{TEST_V
     ok !@mail, 'there are no outgoing emails';
 }
 
-diag "import a second key of rt-test\@example.com" if $ENV{TEST_VERBOSE};
+diag "import a second key of rt-test\@example.com";
 my $fpr2 = '';
 {
     RT::Test->import_gnupg_key('rt-test at example.com.2', 'public');
@@ -169,7 +169,7 @@ my $fpr2 = '';
     $fpr2 = $res{'info'}[2]{'Fingerprint'};
 }
 
-diag "check that things still doesn't work if two keys are not trusted" if $ENV{TEST_VERBOSE};
+diag "check that things still doesn't work if two keys are not trusted";
 {
     RT::Test->clean_caught_mails;
 
@@ -215,7 +215,7 @@ diag "check that things still doesn't work if two keys are not trusted" if $ENV{
     is $res{'info'}[1]{'TrustLevel'}, 0, 'is not trusted key';
 }
 
-diag "check that we see key selector even if only one key is trusted but there are more keys" if $ENV{TEST_VERBOSE};
+diag "check that we see key selector even if only one key is trusted but there are more keys";
 {
     RT::Test->clean_caught_mails;
 
@@ -243,7 +243,7 @@ diag "check that we see key selector even if only one key is trusted but there a
     ok !@mail, 'there are no outgoing emails';
 }
 
-diag "check that key selector works and we can select trusted key" if $ENV{TEST_VERBOSE};
+diag "check that key selector works and we can select trusted key";
 {
     RT::Test->clean_caught_mails;
 
@@ -276,7 +276,7 @@ diag "check that key selector works and we can select trusted key" if $ENV{TEST_
     check_text_emails( { Encrypt => 1 }, @mail );
 }
 
-diag "check encrypting of attachments" if $ENV{TEST_VERBOSE};
+diag "check encrypting of attachments";
 {
     RT::Test->clean_caught_mails;
 
diff --git a/t/web/query_builder.t b/t/web/query_builder.t
index 02ed129..153cb81 100644
--- a/t/web/query_builder.t
+++ b/t/web/query_builder.t
@@ -43,7 +43,7 @@ sub selectedClauses {
 }
 
 
-diag "add the first condition" if $ENV{'TEST_VERBOSE'};
+diag "add the first condition";
 {
     ok $agent->form_name('BuildQuery'), "found the form once";
     $agent->field("ActorField", "Owner");
@@ -53,7 +53,7 @@ diag "add the first condition" if $ENV{'TEST_VERBOSE'};
     is getQueryFromForm, "Owner = 'Nobody'", 'correct query';
 }
 
-diag "set the next condition" if $ENV{'TEST_VERBOSE'};
+diag "set the next condition";
 {
     ok($agent->form_name('BuildQuery'), "found the form again");
     $agent->field("QueueOp", "!=");
@@ -63,7 +63,7 @@ diag "set the next condition" if $ENV{'TEST_VERBOSE'};
         'correct query';
 }
 
-diag "We're going to delete the owner" if $ENV{'TEST_VERBOSE'};
+diag "We're going to delete the owner";
 {
     $agent->select("clauses", ["0"] );
     $agent->click("DeleteClause");
@@ -71,7 +71,7 @@ diag "We're going to delete the owner" if $ENV{'TEST_VERBOSE'};
     is getQueryFromForm, "Queue != 'Regression'", 'correct query';
 }
 
-diag "add a cond with OR and se number by the way" if $ENV{'TEST_VERBOSE'};
+diag "add a cond with OR and se number by the way";
 {
     $agent->field("AndOr", "OR");
     $agent->select("idOp", ">");
@@ -84,7 +84,7 @@ diag "add a cond with OR and se number by the way" if $ENV{'TEST_VERBOSE'};
 
 }
 
-diag "Move the second one up a level" if $ENV{'TEST_VERBOSE'};
+diag "Move the second one up a level";
 {
     $agent->click("Up");
     ok $agent->form_name('BuildQuery'), "found the form again";
@@ -92,7 +92,7 @@ diag "Move the second one up a level" if $ENV{'TEST_VERBOSE'};
     is_deeply selectedClauses, ["0"], 'the one we moved up is selected';
 }
 
-diag "Move the second one right" if $ENV{'TEST_VERBOSE'};
+diag "Move the second one right";
 {
     $agent->click("Right");
     ok $agent->form_name('BuildQuery'), "found the form again";
@@ -101,7 +101,7 @@ diag "Move the second one right" if $ENV{'TEST_VERBOSE'};
     is_deeply selectedClauses, ["2"], 'the one we moved right is selected';
 }
 
-diag "Move the block up" if $ENV{'TEST_VERBOSE'};
+diag "Move the block up";
 {
     $agent->select("clauses", ["1"]);
     $agent->click("Up");
@@ -111,7 +111,7 @@ diag "Move the block up" if $ENV{'TEST_VERBOSE'};
 }
 
 
-diag "Can not move up the top most clause" if $ENV{'TEST_VERBOSE'};
+diag "Can not move up the top most clause";
 {
     $agent->select("clauses", ["0"]);
     $agent->click("Up");
@@ -120,7 +120,7 @@ diag "Can not move up the top most clause" if $ENV{'TEST_VERBOSE'};
     is_deeply selectedClauses, ["0"], 'the one we tried to move is selected';
 }
 
-diag "Can not move left the left most clause" if $ENV{'TEST_VERBOSE'};
+diag "Can not move left the left most clause";
 {
     $agent->click("Left");
     ok($agent->form_name('BuildQuery'), "found the form again");
@@ -128,7 +128,7 @@ diag "Can not move left the left most clause" if $ENV{'TEST_VERBOSE'};
     is_deeply selectedClauses, ["0"], 'the one we tried to move is selected';
 }
 
-diag "Add a condition into a nested block" if $ENV{'TEST_VERBOSE'};
+diag "Add a condition into a nested block";
 {
     $agent->select("clauses", ["1"]);
     $agent->select("ValueOfStatus" => "stalled");
@@ -140,8 +140,7 @@ diag "Add a condition into a nested block" if $ENV{'TEST_VERBOSE'};
         "added new one";
 }
 
-diag "click advanced, enter 'C1 OR ( C2 AND C3 )', apply, aggregators should stay the same."
-    if $ENV{'TEST_VERBOSE'};
+diag "click advanced, enter 'C1 OR ( C2 AND C3 )', apply, aggregators should stay the same.";
 {
     my $response = $agent->get($url."Search/Edit.html");
     ok( $response->is_success, "Fetched /Search/Edit.html" );
@@ -224,8 +223,7 @@ diag "click advanced, enter 'C1 OR ( C2 AND C3 )', apply, aggregators should sta
 
 }
 
-diag "input a condition, select (several conditions), click delete"
-    if $ENV{'TEST_VERBOSE'};
+diag "input a condition, select (several conditions), click delete";
 {
     my $response = $agent->get( $url."Search/Edit.html" );
     ok $response->is_success, "Fetched /Search/Edit.html";
diff --git a/t/web/rights.t b/t/web/rights.t
index b47ba99..7b93a7e 100644
--- a/t/web/rights.t
+++ b/t/web/rights.t
@@ -22,7 +22,7 @@ sub get_rights {
     return @rights;
 };
 
-diag "load Everyone group" if $ENV{'TEST_VERBOSE'};
+diag "load Everyone group";
 my ($everyone, $everyone_gid);
 {
     $everyone = RT::Group->new( $RT::SystemUser );
@@ -30,7 +30,7 @@ my ($everyone, $everyone_gid);
     ok($everyone_gid = $everyone->id, "loaded 'everyone' group");
 }
 
-diag "revoke all global rights from Everyone group" if $ENV{'TEST_VERBOSE'};
+diag "revoke all global rights from Everyone group";
 my @has = get_rights( $m, $everyone_gid, 'RT::System-1' );
 if ( @has ) {
     $m->form_number(3);
@@ -42,7 +42,7 @@ if ( @has ) {
     ok(1, 'the group has no global rights');
 }
 
-diag "grant SuperUser right to everyone" if $ENV{'TEST_VERBOSE'};
+diag "grant SuperUser right to everyone";
 {
     $m->form_number(3);
     $m->select("GrantRight-$everyone_gid-RT::System-1", ['SuperUser']);
@@ -54,7 +54,7 @@ diag "grant SuperUser right to everyone" if $ENV{'TEST_VERBOSE'};
     is_deeply( [get_rights( $m, $everyone_gid, 'RT::System-1' )], ['SuperUser'], 'granted SuperUser right' );
 }
 
-diag "revoke the right" if $ENV{'TEST_VERBOSE'};
+diag "revoke the right";
 {
     $m->form_number(3);
     $m->tick("RevokeRight-$everyone_gid-RT::System-1", 'SuperUser');
@@ -67,7 +67,7 @@ diag "revoke the right" if $ENV{'TEST_VERBOSE'};
 }
 
 
-diag "return rights the group had in the beginning" if $ENV{'TEST_VERBOSE'};
+diag "return rights the group had in the beginning";
 if ( @has ) {
     $m->form_number(3);
     $m->select("GrantRight-$everyone_gid-RT::System-1", \@has);
diff --git a/t/web/ticket_owner.t b/t/web/ticket_owner.t
index e9b1d8d..0460436 100644
--- a/t/web/ticket_owner.t
+++ b/t/web/ticket_owner.t
@@ -28,7 +28,7 @@ ok( RT::Test->set_rights(
 my $agent_a = RT::Test::Web->new;
 ok $agent_a->login('user_a', 'password'), 'logged in as user A';
 
-diag "current user has no right to own, nobody selected as owner on create" if $ENV{TEST_VERBOSE};
+diag "current user has no right to own, nobody selected as owner on create";
 {
     $agent_a->get_ok('/', 'open home page');
     $agent_a->form_name('CreateTicketInQueue');
@@ -52,7 +52,7 @@ diag "current user has no right to own, nobody selected as owner on create" if $
     is $ticket->Owner, $RT::Nobody->id, 'correct owner';
 }
 
-diag "user can chose owner of a new ticket" if $ENV{TEST_VERBOSE};
+diag "user can chose owner of a new ticket";
 {
     $agent_a->get_ok('/', 'open home page');
     $agent_a->form_name('CreateTicketInQueue');
@@ -81,7 +81,7 @@ diag "user can chose owner of a new ticket" if $ENV{TEST_VERBOSE};
 my $agent_b = RT::Test::Web->new;
 ok $agent_b->login('user_b', 'password'), 'logged in as user B';
 
-diag "user A can not change owner after create" if $ENV{TEST_VERBOSE};
+diag "user A can not change owner after create";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -113,11 +113,11 @@ diag "user A can not change owner after create" if $ENV{TEST_VERBOSE};
     };
 
     $test_cb->($agent_a);
-    diag "even owner(user B) can not change owner" if $ENV{TEST_VERBOSE};
+    diag "even owner(user B) can not change owner";
     $test_cb->($agent_b);
 }
 
-diag "on reply correct owner is selected" if $ENV{TEST_VERBOSE};
+diag "on reply correct owner is selected";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -146,7 +146,7 @@ ok( RT::Test->set_rights(
     { Principal => $user_b, Right => [qw(SeeQueue ShowTicket OwnTicket)] },
 ), 'set rights');
 
-diag "Couldn't take without coresponding right" if $ENV{TEST_VERBOSE};
+diag "Couldn't take without coresponding right";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -163,7 +163,7 @@ diag "Couldn't take without coresponding right" if $ENV{TEST_VERBOSE};
         'no Steal link as well';
 }
 
-diag "Couldn't steal without coresponding right" if $ENV{TEST_VERBOSE};
+diag "Couldn't steal without coresponding right";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -185,7 +185,7 @@ ok( RT::Test->set_rights(
     { Principal => $user_a, Right => [qw(SeeQueue ShowTicket CreateTicket TakeTicket)] },
 ), 'set rights');
 
-diag "TakeTicket require OwnTicket to work" if $ENV{TEST_VERBOSE};
+diag "TakeTicket require OwnTicket to work";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -207,7 +207,7 @@ ok( RT::Test->set_rights(
     { Principal => $user_b, Right => [qw(SeeQueue ShowTicket OwnTicket)] },
 ), 'set rights');
 
-diag "TakeTicket+OwnTicket work" if $ENV{TEST_VERBOSE};
+diag "TakeTicket+OwnTicket work";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -228,7 +228,7 @@ diag "TakeTicket+OwnTicket work" if $ENV{TEST_VERBOSE};
     is $ticket->Owner, $user_a->id, 'correct owner';
 }
 
-diag "TakeTicket+OwnTicket don't work when owner is not nobody" if $ENV{TEST_VERBOSE};
+diag "TakeTicket+OwnTicket don't work when owner is not nobody";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -251,7 +251,7 @@ ok( RT::Test->set_rights(
     { Principal => $user_b, Right => [qw(SeeQueue ShowTicket OwnTicket)] },
 ), 'set rights');
 
-diag "StealTicket require OwnTicket to work" if $ENV{TEST_VERBOSE};
+diag "StealTicket require OwnTicket to work";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -274,7 +274,7 @@ ok( RT::Test->set_rights(
     { Principal => $user_b, Right => [qw(SeeQueue ShowTicket OwnTicket)] },
 ), 'set rights');
 
-diag "StealTicket+OwnTicket work" if $ENV{TEST_VERBOSE};
+diag "StealTicket+OwnTicket work";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -296,7 +296,7 @@ diag "StealTicket+OwnTicket work" if $ENV{TEST_VERBOSE};
     is $ticket->Owner, $user_a->id, 'correct owner';
 }
 
-diag "StealTicket+OwnTicket don't work when owner is nobody" if $ENV{TEST_VERBOSE};
+diag "StealTicket+OwnTicket don't work when owner is nobody";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -318,7 +318,7 @@ ok( RT::Test->set_rights(
     { Principal => $user_b, Right => [qw(SeeQueue ShowTicket OwnTicket)] },
 ), 'set rights');
 
-diag "no Steal link when owner nobody" if $ENV{TEST_VERBOSE};
+diag "no Steal link when owner nobody";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -335,7 +335,7 @@ diag "no Steal link when owner nobody" if $ENV{TEST_VERBOSE};
         'but have Take link');
 }
 
-diag "no Take link when owner is not nobody" if $ENV{TEST_VERBOSE};
+diag "no Take link when owner is not nobody";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
diff --git a/t/web/ticket_owner_autocomplete.t b/t/web/ticket_owner_autocomplete.t
index dcc9f46..24df427 100644
--- a/t/web/ticket_owner_autocomplete.t
+++ b/t/web/ticket_owner_autocomplete.t
@@ -30,7 +30,7 @@ ok( RT::Test->set_rights(
 my $agent_a = RT::Test::Web->new;
 ok $agent_a->login('user_a', 'password'), 'logged in as user A';
 
-diag "current user has no right to own, nobody selected as owner on create" if $ENV{TEST_VERBOSE};
+diag "current user has no right to own, nobody selected as owner on create";
 {
     $agent_a->get_ok('/', 'open home page');
     $agent_a->form_name('CreateTicketInQueue');
@@ -53,7 +53,7 @@ diag "current user has no right to own, nobody selected as owner on create" if $
     is $ticket->Owner, $RT::Nobody->id, 'correct owner';
 }
 
-diag "user can chose owner of a new ticket" if $ENV{TEST_VERBOSE};
+diag "user can chose owner of a new ticket";
 {
     $agent_a->get_ok('/', 'open home page');
     $agent_a->form_name('CreateTicketInQueue');
@@ -81,7 +81,7 @@ diag "user can chose owner of a new ticket" if $ENV{TEST_VERBOSE};
 my $agent_b = RT::Test::Web->new;
 ok $agent_b->login('user_b', 'password'), 'logged in as user B';
 
-diag "user A can not change owner after create" if $ENV{TEST_VERBOSE};
+diag "user A can not change owner after create";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
@@ -113,11 +113,11 @@ diag "user A can not change owner after create" if $ENV{TEST_VERBOSE};
     };
 
     $test_cb->($agent_a);
-    diag "even owner(user B) can not change owner" if $ENV{TEST_VERBOSE};
+    diag "even owner(user B) can not change owner";
     $test_cb->($agent_b);
 }
 
-diag "on reply correct owner is selected" if $ENV{TEST_VERBOSE};
+diag "on reply correct owner is selected";
 {
     my $ticket = RT::Ticket->new( $user_a );
     my ($id, $txn, $msg) = $ticket->Create(
diff --git a/t/web/ticket_seen.t b/t/web/ticket_seen.t
index 3a77a58..748f2cb 100644
--- a/t/web/ticket_seen.t
+++ b/t/web/ticket_seen.t
@@ -30,7 +30,7 @@ ok $agent_a->login('user_a', 'password'), 'logged in as user A';
 my $agent_b = RT::Test::Web->new;
 ok $agent_b->login('user_b', 'password'), 'logged in as user B';
 
-diag "create a ticket for testing" if $ENV{TEST_VERBOSE};
+diag "create a ticket for testing";
 my $tid;
 {
     my $ticket = RT::Ticket->new( $user_a );
@@ -44,7 +44,7 @@ my $tid;
     is $ticket->Owner, $user_a->id, 'correct owner';
 }
 
-diag "user B adds a message, we check that user A see notification and can clear it" if $ENV{TEST_VERBOSE};
+diag "user B adds a message, we check that user A see notification and can clear it";
 {
     my $ticket = RT::Ticket->new( $user_b );
     $ticket->Load( $tid );

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


More information about the Rt-commit mailing list