Deal with a variety of low-level test warnings.

* Stop red warning being output by S3 bucket creation failure test
* Make sure 'num_old_reports' is always a number on /around pages
* Stop 'category_extra' being generated when unnecessary
* Prevent warning printed in getservicerequestupdates.t
* Prevent info lines from being output in develop.t
* Remove line of #s in root.t
* And an ID diag in zurich.t

5 files changed, 11 insertions, 4 deletions

diff --git a/t/app/controller/develop.t b/t/app/controller/develop.t
index 8f26a9f16..7fde5ef83 100644
--- a/t/app/controller/develop.t
+++ b/t/app/controller/develop.t
@@ -1,5 +1,8 @@
 use FixMyStreet::TestMech;
 
+FixMyStreet::App->log->disable('info');
+END { FixMyStreet::App->log->enable('info'); }
+
 ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' );
 
 my ($problem) = $mech->create_problems_for_body(1, 2504, 'title');
diff --git a/t/app/controller/root.t b/t/app/controller/root.t
index b5f8ba031..85119da24 100644
--- a/t/app/controller/root.t
+++ b/t/app/controller/root.t
@@ -75,7 +75,6 @@ FixMyStreet::override_config {
 };
 
 subtest "check_login_disallowed cobrand hook" => sub {
-    warn '#' x 50 . "\n";
     my $cobrand = Test::MockModule->new('FixMyStreet::Cobrand::Default');
     $cobrand->mock('check_login_disallowed', sub {
             my $self = shift;
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index dbd6ec882..2f60231ab 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -959,7 +959,6 @@ subtest "test stats" => sub {
 };
 
 subtest "test admin_log" => sub {
-    diag $report->id;
     my @entries = FixMyStreet::DB->resultset('AdminLog')->search({
         object_type => 'problem',
         object_id   => $report->id,
diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t
index 995338063..2f7917946 100644
--- a/t/open311/getservicerequestupdates.t
+++ b/t/open311/getservicerequestupdates.t
@@ -421,7 +421,10 @@ for my $test (
         $problem->state( $test->{start_state} );
         $problem->update;
 
-        my $update = Open311::GetServiceRequestUpdates->new( system_user => $user );
+        my $update = Open311::GetServiceRequestUpdates->new(
+            system_user => $user,
+            blank_updates_permitted => 1,
+        );
         $update->update_comments( $o, $bodies{2482} );
 
         is $problem->comments->count, 1, 'comment count';
diff --git a/t/photostorage/s3.t b/t/photostorage/s3.t
index fa989374f..ec0fadc15 100644
--- a/t/photostorage/s3.t
+++ b/t/photostorage/s3.t
@@ -2,6 +2,7 @@
 use FixMyStreet::Test;
 
 use Test::MockModule;
+use Test::Warn;
 use Path::Tiny 'path';
 use Net::Amazon::S3::Client::Bucket;
 
@@ -112,7 +113,9 @@ FixMyStreet::override_config {
             $create_bucket_called = 1;
         });
 
-        ok !$s3->init(), "PhotoStorage::S3::init failed";
+        warning_like {
+            $s3->init();
+        } qr/S3 bucket 'fms-test-photos' doesn't exist and CREATE_BUCKET is not set./, 'PhotoStorage::S3::init failed';
         ok $buckets_called, "Client::buckets called";
         ok !$create_bucket_called, "Client::create_bucket not called";
     };