X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F94versioning.t;h=93fcca7faee264568816a2b1042f81830d4ee219;hb=052a832c5f6fe0f82a4db48e176525f700c44159;hp=299ac2fbce80ca57e4d7fff8d3c51d4ba2898048;hpb=eed5492fecb339252aaad11adb22651e5bd06d7b;p=dbsrgits%2FDBIx-Class.git diff --git a/t/94versioning.t b/t/94versioning.t index 299ac2f..93fcca7 100644 --- a/t/94versioning.t +++ b/t/94versioning.t @@ -11,6 +11,7 @@ use Time::HiRes qw/time sleep/; use lib qw(t/lib); use DBICTest; +use DBIx::Class::_Util 'sigwarn_silencer'; my ($dsn, $user, $pass); @@ -167,7 +168,7 @@ my $schema_v3 = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_versio # attempt v1 -> v3 upgrade { - local $SIG{__WARN__} = sub { warn $_[0] if $_[0] !~ /Attempting upgrade\.$/ }; + local $SIG{__WARN__} = sigwarn_silencer( qr/Attempting upgrade\.$/ ); $schema_v3->upgrade(); is($schema_v3->get_db_version(), '3.0', 'db version number upgraded'); } @@ -196,7 +197,7 @@ my $schema_v3 = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_versio # Then attempt v1 -> v3 upgrade { - local $SIG{__WARN__} = sub { warn $_[0] if $_[0] !~ /Attempting upgrade\.$/ }; + local $SIG{__WARN__} = sigwarn_silencer( qr/Attempting upgrade\.$/ ); $schema_v3->upgrade(); is($schema_v3->get_db_version(), '3.0', 'db version number upgraded to 3.0'); @@ -250,7 +251,8 @@ my $schema_v3 = DBICVersion::Schema->connect($dsn, $user, $pass, { ignore_versio $schema_v2->deploy; } - local $SIG{__WARN__} = sub { warn $_[0] if $_[0] !~ /Attempting upgrade\.$/ }; + local $SIG{__WARN__} = sigwarn_silencer( qr/Attempting upgrade\.$/ ); + $schema_v2->upgrade(); is($schema_v2->get_db_version(), '3.0', 'Fast deploy/upgrade');