Merge master into psgi branch

[catagits/Catalyst-Runtime.git] / t / aggregate / unit_core_script_server.t

diff --git a/t/aggregate/unit_core_script_server.t b/t/aggregate/unit_core_script_server.t
index fce5045..63f02ca 100644 (file)
--- a/t/aggregate/unit_core_script_server.t
+++ b/t/aggregate/unit_core_script_server.t
@@ -48,13 +48,15 @@ testOption( [ qw/-k/ ], ['3000', undef, opthash(keepalive => 1)] );
 testOption( [ qw/--keepalive/ ], ['3000', undef, opthash(keepalive => 1)] );
 
 # symlinks       -follow_symlinks          --sym --follow_symlinks
-testOption( [ qw/--follow_symlinks/ ], ['3000', undef, opthash(follow_symlinks => 1)] );
+#
 testOption( [ qw/--sym/ ], ['3000', undef, opthash(follow_symlinks => 1)] );
+testOption( [ qw/--follow_symlinks/ ], ['3000', undef, opthash(follow_symlinks => 1)] );
 
 # background     -background               --bg --background
 testOption( [ qw/--background/ ], ['3000', undef, opthash(background => 1)] );
 testOption( [ qw/--bg/ ], ['3000', undef, opthash(background => 1)] );
 
+
 # restart        -r -restart --restart     -R --restart
 testRestart( ['-r'], restartopthash() );
 {
@@ -102,9 +104,17 @@ sub testOption {
     };
     # First element of RUN_ARGS will be the script name, which we don't care about
     shift @TestAppToTestScripts::RUN_ARGS;
+    my $server = pop @TestAppToTestScripts::RUN_ARGS;
+    like ref($server), qr/^Plack::Handler/, 'Is a Plack::Handler';
+
+    my @run_args =  @TestAppToTestScripts::RUN_ARGS;
+    $run_args[-1]->{pidfile} = $run_args[-1]->{pidfile}->file->stringify
+      if $run_args[-1]->{pidfile};
+
+
     # Mangle argv into the options..
     $resultarray->[-1]->{argv} = $argstring;
-    is_deeply \@TestAppToTestScripts::RUN_ARGS, $resultarray, "is_deeply comparison " . join(' ', @$argstring);
+    is_deeply \@run_args, $resultarray, "is_deeply comparison " . join(' ', @$argstring);
 }
 
 sub testRestart {
@@ -151,8 +161,5 @@ sub restartopthash {
         host => undef,
         %$opthash,
     };
-    delete $val->{fork};
-    delete $val->{background};
-    delete $val->{keepalive};
     return $val;
 }