=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/t/51-network-add_su-ap.t,v retrieving revision 1.2 retrieving revision 1.5 diff -u -r1.2 -r1.5 --- trango/Net-Telnet-Trango/t/51-network-add_su-ap.t 2007/02/06 16:23:17 1.2 +++ trango/Net-Telnet-Trango/t/51-network-add_su-ap.t 2007/02/06 17:40:02 1.5 @@ -1,7 +1,7 @@ #!perl -T -# $RedRiver: 51-network-add_su.t,v 1.1 2007/02/06 00:42:33 andrew Exp $ +# $RedRiver: 51-network-add_su-ap.t,v 1.4 2007/02/06 16:52:21 andrew Exp $ -use Test::More tests => 17; +use Test::More tests => 12; use File::Spec; BEGIN { @@ -9,13 +9,13 @@ } diag("Testing Net::Telnet::Trango $Net::Telnet::Trango::VERSION, Perl $], $^X"); -diag(" Generic tests"); +diag(" AP tests when adding an SU to an AP"); my $cfg_file = File::Spec->catfile('t', 'tests.cfg'); my ($cir, $mir) = (128, 256); SKIP: { - my $skipped = 16; + my $skipped = 11; my %cfg; if (-e $cfg_file) { if (open my $fh, $cfg_file) { @@ -58,8 +58,6 @@ my $t; ok($t = Net::Telnet::Trango->new(), "Instantiating object"); - $t->input_log('input.log'); # XXX Debugging - ok($t->open($host), "Opening connection to $host"); ok($t->is_connected, "connected"); @@ -68,7 +66,6 @@ ok($t->logged_in, "logged in"); - my $sudb; if ((!ok($sudb = $t->sudb_view, "Getting sudb")) && $t->last_error ) { @@ -99,15 +96,13 @@ } - my $result; - if ( (! ok($result = $t->sudb_add($su_id, 'reg', $cir, $mir, $su_mac), - "Adding su")) + if ( (! ok($t->sudb_add($su_id, 'reg', $cir, $mir, $su_mac), "Adding su")) && $t->last_error ) { diag('ERR: ' . $t->last_error); } - ok($result = $t->save_sudb, "Saving sudb"); - if ( (! $result ) && $t->last_error ) { + if ( (! ok($t->save_sudb, "Saving sudb")) + && $t->last_error ) { diag('ERR: ' . $t->last_error); } @@ -133,31 +128,6 @@ } is($in_sudb, 1, "Correct SU is in SUDB"); - - my $opmode; - ok($opmode = $t->opmode, "getting current opmode"); - - if ($opmode->{Opmode} eq 'ap') { - ok(1, "Already opmode ap"); - } else { - if ((! ok($result = $t->opmode('ap y'), "Setting opmode ap y")) - && $t->last_error ) { - diag('ERR: ' . $t->last_error); - } - } - - $opmode = {}; - ok($opmode = $t->opmode, "getting current opmode"); - if (ref $opmode eq 'HASH' && $opmode->{ERR}) { - diag("Error: $opmode->{ERR}"); - } - - is($opmode->{Opmode}, 'ap', "Checking opmode is ap"); - - if (! ok($result = $t->save_ss, "Saving systemsetting") - && $t->last_error ) { - diag('ERR: ' . $t->last_error); - } ok($t->bye, "Goodbye"); }