finally fix RT #84096

Changes

@@ -1,5 +1,5 @@
 {{$NEXT}}
-- hopefully fix nonetwork.t under Win32
+- fix nonetwork.t under Win32, see RT #84096
 
 1.06      2013-03-01 15:49:54 Europe/London
 - better work around exceptions in File::ChangeNotify

t/lib/BrokerTestApp.pm

@@ -9,6 +9,8 @@ my $app = sub {
     my $data = JSON::XS::decode_json($body);
     my $response = {};
 
+    exit 0 if $data->{exit_now};
+
     $response->{path_info} = $env->{PATH_INFO};
 
     if ($data->{reply_to}) {

t/lib/RunTestApp.pm

@@ -69,6 +69,7 @@ sub _build_child {
                                       # values across the fork
     my $pid = fork();
     if ($pid == 0) {
+        $SIG{TERM}=sub{exit 0};
         my $runner = Plack::Handler::Stomp->new({
             servers => [ { hostname => 'localhost', port => 61613 } ],
             subscriptions => [
@@ -102,6 +103,7 @@ sub _build_child {
 
 sub DEMOLISH {
     my ($self) = @_;
+
     return unless $self->has_child;
 
     my $child = $self->child;

t/lib/RunTestAppNoNet.pm

@@ -40,7 +40,11 @@ sub _build_child {
     my $trace_dir = $self->trace_dir; # make sure we don't get two
                                       # values across the fork
     my $pid = fork();
-    if ($pid == 0) {
+    if (!defined $pid) {
+        die "Can't start server: $!";
+    }
+    elsif ($pid == 0) {
+        $SIG{TERM}=sub{exit 0};
         my $runner = Plack::Handler::Stomp::NoNetwork->new({
             subscriptions => [
                 { destination => '/queue/plack-handler-stomp-test' },

t/nonetwork.t

@@ -138,8 +138,16 @@ test 'talk to the app' => sub {
         );
 
     };
-};
 
+    $prod->send(
+        '/topic/plack-handler-stomp-test',
+        {
+            type => 'test_foo',
+        },
+        JSON::XS::encode_json({exit_now=>1}),
+    );
+};
 
 run_me;
+
 done_testing;

t/real_broker.t

@@ -104,8 +104,21 @@ test 'talk to the app' => sub {
                        @case_comparers,
                    ],
                    'tracing works'
-               )
+               );
     };
+
+    # we send the "exit now" command on the topic, so we're sure we
+    # won't find it on the next run
+    #
+    # BrokerTestApp exits without ACK-ing the message, so it would
+    # remain on the queue, ready to stop the application the next time
+    # we try to run the test
+    $conn->send( {
+        destination => '/topic/plack-handler-stomp-test',
+        body => JSON::XS::encode_json({exit_now=>1}),
+        JMSType => 'test_foo',
+    } );
+
 };
 
 run_me;