X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Funit_core_script_fastcgi.t;h=7201385bc392468e1daa0aa5ee09f880c257f245;hb=ef41ea15458d2d2beddee792deea598249df2852;hp=7d4da0f6f6b59246270de34e2a62ca727e0e239b;hpb=6ec45f3776a574c07ffa70b69001f121c78afb57;p=catagits%2FCatalyst-Runtime.git diff --git a/t/aggregate/unit_core_script_fastcgi.t b/t/aggregate/unit_core_script_fastcgi.t index 7d4da0f..7201385 100644 --- a/t/aggregate/unit_core_script_fastcgi.t +++ b/t/aggregate/unit_core_script_fastcgi.t @@ -19,12 +19,13 @@ testOption( [ qw|-l /tmp/foo| ], ['/tmp/foo', opthash()] ); testOption( [ qw/-l 127.0.0.1:3000/ ], ['127.0.0.1:3000', opthash()] ); #daemonize -d --daemon -testOption( [ qw/-d/ ], [undef, opthash()] ); -testOption( [ qw/--daemon/ ], [undef, opthash()] ); +testOption( [ qw/-d/ ], [undef, opthash(detach => 1)] ); +testOption( [ qw/--daemon/ ], [undef, opthash(detach => 1)] ); -# pidfile -pidfile --pid --pidfile +# pidfile -pidfile -p --pid --pidfile testOption( [ qw/--pidfile cat.pid/ ], [undef, opthash(pidfile => 'cat.pid')] ); testOption( [ qw/--pid cat.pid/ ], [undef, opthash(pidfile => 'cat.pid')] ); +testOption( [ qw/-p cat.pid/ ], [undef, opthash(pidfile => 'cat.pid')] ); # manager testOption( [ qw/--manager foo::bar/ ], [undef, opthash(manager => 'foo::bar')] ); @@ -38,9 +39,8 @@ testOption( [ qw/-e/ ], [undef, opthash(keep_stderr => 1)] ); testOption( [ qw/--nproc 6/ ], [undef, opthash(nproc => 6)] ); testOption( [ qw/--n 6/ ], [undef, opthash(nproc => 6)] ); -# detach -testOption( [ qw/--detach/ ], [undef, opthash(detach => 1)] ); -testOption( [ qw/--det/ ], [undef, opthash(detach => 1)] ); +# proc_title +testOption( [ qw/--proc_title foo/ ], [undef, opthash(proc_title => 'foo')] ); done_testing; @@ -54,17 +54,16 @@ sub testOption { } "new_with_options"; # 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'; is_deeply \@TestAppToTestScripts::RUN_ARGS, $resultarray, "is_deeply comparison"; } # Returns the hash expected when no flags are passed sub opthash { return { - pidfile => undef, - keep_stderr => undef, - detach => undef, - nproc => undef, - manager => undef, + (map { ($_ => undef) } qw(pidfile keep_stderr detach nproc manager)), + proc_title => 'perl-fcgi-pm [TestAppToTestScripts]', @_, }; }