X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fwatchdog.t;h=bd8f576b32f8ad832ef1ed96debdc66f72a23a23;hb=bef36e73e4257b2ba8e59eb55661ffc51d8a620a;hp=c7e2c1fd464802a819b69a5c01a0f6a416dee2da;hpb=f129bfaf05b1ae0e2e2992cad47a70482dec9885;p=scpubgit%2FObject-Remote.git diff --git a/t/watchdog.t b/t/watchdog.t index c7e2c1f..bd8f576 100644 --- a/t/watchdog.t +++ b/t/watchdog.t @@ -1,14 +1,14 @@ use strictures 1; use Test::More; -require 't/logsetup.pl'; +$ENV{OBJECT_REMOTE_TEST_LOGGER} = 1; use Object::Remote::Connection; -use Object::Remote::FromData; +use Object::Remote::FromData; $SIG{ALRM} = sub { fail("Watchdog killed remote process in time"); die "test failed" }; -my $conn = Object::Remote::Connection->conn_from_spec("-", watchdog_timeout => 1)->connect; +my $conn = Object::Remote->connect("-", watchdog_timeout => 1); my $remote = HangClass->new::on($conn); @@ -19,9 +19,9 @@ alarm(3); eval { $remote->hang }; -like($@, qr/^Object::Remote connection lost: eof/, "Correct error message"); +like($@, qr/^Object::Remote connection lost: (?:eof|.*Broken pipe)/, "Correct error message"); -done_testing; +done_testing; __DATA__ @@ -30,13 +30,13 @@ package HangClass; use Moo; sub alive { - return 1; + return 1; } sub hang { - while(1) { - sleep(1); - } + while(1) { + sleep(1); + } }