mirror of
https://github.com/Telecominfraproject/wlan-lanforge-scripts.git
synced 2025-11-01 19:28:00 +00:00
lf_testmod: Make sure settings are flushed.
Utils: Add option to doCmd to allow waiting for arbitrary text, that way we can ignore intervening 'RSLT' lines when doing batched cmds.
This commit is contained in:
@@ -87,6 +87,11 @@ sub doCmd {
|
|||||||
my $self = shift;
|
my $self = shift;
|
||||||
my $cmd = shift;
|
my $cmd = shift;
|
||||||
my $nowait = shift;
|
my $nowait = shift;
|
||||||
|
my $waitfor = shift;
|
||||||
|
|
||||||
|
if (!defined($waitfor)) {
|
||||||
|
$waitfor = '/ >>RSLT:(.*)/';
|
||||||
|
}
|
||||||
|
|
||||||
#print "CMD[[$cmd]]\n";
|
#print "CMD[[$cmd]]\n";
|
||||||
my $t = ${$self->{telnet}};
|
my $t = ${$self->{telnet}};
|
||||||
@@ -99,7 +104,7 @@ sub doCmd {
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
my @rslt = $t->waitfor('/ >>RSLT:(.*)/');
|
my @rslt = $t->waitfor($waitfor);
|
||||||
if ( !$self->cli_rcv_silent() ) {
|
if ( !$self->cli_rcv_silent() ) {
|
||||||
print "**************\n@rslt\n................\n\n";
|
print "**************\n@rslt\n................\n\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -183,8 +183,18 @@ elsif ($::action eq "set") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$cmd = "add_text_blob '$test_type' '$test_name' $ln";
|
$cmd = "add_text_blob '$test_type' '$test_name' $ln";
|
||||||
$::utils->doCmd($cmd, 1); # send and do not wait for result
|
print("$cmd\n");
|
||||||
|
if ($i % 25 == 0) {
|
||||||
|
$::utils->doCmd($cmd, 1); # send and do not wait for result
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$::utils->doCmd($cmd); # send and wait for result
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Wait until we complete processing of all cmds.
|
||||||
|
$cmd = "gossip __gossip_test__";
|
||||||
|
$::utils->doCmd($cmd, 0, "/__gossip_test__/");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
die("Unknown action: $::action\n$::usage\n");
|
die("Unknown action: $::action\n$::usage\n");
|
||||||
|
|||||||
Reference in New Issue
Block a user