=================================================================== RCS file: /cvs/HOPE/Net-OpenAMD/t/local_server.t,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HOPE/Net-OpenAMD/t/local_server.t 2010/06/26 15:14:36 1.3 +++ HOPE/Net-OpenAMD/t/local_server.t 2010/06/26 17:33:33 1.4 @@ -1,43 +1,36 @@ #!perl -# $AFresh1: local_server.t,v 1.2 2010/06/26 14:02:31 andrew Exp $ +# $AFresh1: local_server.t,v 1.3 2010/06/26 14:14:36 andrew Exp $ use Test::More;# tests => 75; use strict; use warnings; -#use File::Temp qw/ tempdir /; -#use File::Copy qw/ cp /; -#use File::Spec; +use Net::OpenAMD; my $have_test_json = 1; BEGIN { use FindBin; - use lib "$FindBin::Bin/../../../mojo/lib"; + use lib "$FindBin::Bin"; + use lib "$FindBin::Bin/../../mojo/lib"; eval "use Test::Mojo::Server"; plan skip_all => "Test::Mojo::Server required for testing local server" if $@; + require 'network_tests.t'; } my $server = Test::Mojo::Server->new(); $server->executable('test_server.pl'); -#$server = $server->command('perl t/test_server.pl'); my $path = $server->find_executable_ok('executable found'); -#print "PATH: $path\n"; -#my $port = $server->generate_port_ok('port test'); - my $port = $server->start_daemon_ok('daemon test'); -print "Port: $port\n"; - $server->server_ok('server running'); -my $pid = $server->pid; -print "PID: $pid\n"; +# XXX tests here +my $amd = Net::OpenAMD->new(); +NetworkTests::run_tests($amd); $server->stop_server_ok('server stopped'); - done_testing(); -exit;