[Jifty-commit] r7618 - jifty/trunk/t/TestApp-RestartServer/t

Jifty commits jifty-commit at lists.jifty.org
Mon Nov 16 20:01:24 EST 2009


Author: sartak
Date: Mon Nov 16 20:01:23 2009
New Revision: 7618

Modified:
   jifty/trunk/t/TestApp-RestartServer/t/restart.t

Log:
Use get_perl_cmd for restart.t too

Modified: jifty/trunk/t/TestApp-RestartServer/t/restart.t
==============================================================================
--- jifty/trunk/t/TestApp-RestartServer/t/restart.t	(original)
+++ jifty/trunk/t/TestApp-RestartServer/t/restart.t	Mon Nov 16 20:01:23 2009
@@ -4,6 +4,7 @@
 use Test::More;
 use File::Spec;
 use Jifty::Test::WWW::Mechanize;
+use Test::Script::Run 'get_perl_cmd';
 use FindBin qw($Bin);
 use Cwd;
 my $cwd;
@@ -30,10 +31,6 @@
 my $config = <$fh>;
 like( $config, qr/AdminMode: 1/, 'admin mode in config is enabled' );
 
-my $INC =
-  [ grep { defined } map { File::Spec->rel2abs($_) } grep { !ref } @INC ];
-my @perl = ( $^X, map { "-I$_" } @$INC );
-
 my $pid = fork;
 die 'fork failed' unless defined $pid;
 
@@ -49,7 +46,7 @@
     $config =~ s/AdminMode: 1/AdminMode: 0/;
     like( $config, qr/AdminMode: 0/, 'admin mode in config is off' );
     write_file( $config_path, $config );
-    system("@perl bin/jifty server --restart");
+    system(get_perl_cmd('jifty'), 'server', '--restart');
     sleep 5;
     $mech->get_ok($URL);
     $mech->content_like( qr/pony\.jpg/, 'we still have a pony!' );
@@ -57,11 +54,11 @@
         qr/Administration mode is enabled/,
         'admin mode is gone on page, restart works!',
     );
-    system("@perl bin/jifty server --stop");
-    system("@perl bin/jifty schema --drop-database");
+    system(get_perl_cmd('jifty'), 'server', '--stop');
+    system(get_perl_cmd('jifty'), 'schema', '--drop-database');
 }
 else {
-    system("@perl bin/jifty server");
+    system(get_perl_cmd('jifty'), 'server');
     exit 0;
 }
 


More information about the Jifty-commit mailing list