scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 19:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

lf_testmod: Make sure settings are flushed.

Browse Source 
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:
Ben Greear
2020-04-24 12:36:22 -07:00
parent 3a91d94103
commit 10c706e4ec
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
LANforge/Utils.pm
View File

@@ -87,6 +87,11 @@ sub doCmd {
my $self = shift;
my $cmd = shift;
my $nowait = shift;
my $waitfor = shift;
if (!defined($waitfor)) {
$waitfor = '/ >>RSLT:(.*)/';
}
#print "CMD[[$cmd]]\n";
my $t = ${$self->{telnet}};
@@ -99,7 +104,7 @@ sub doCmd {
return "";
}
my @rslt = $t->waitfor('/ >>RSLT:(.*)/');
my @rslt = $t->waitfor($waitfor);
if ( !$self->cli_rcv_silent() ) {
print "**************\n@rslt\n................\n\n";
}

12
lf_testmod.pl
View File

@@ -183,8 +183,18 @@ elsif ($::action eq "set") {
}
$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 {
die("Unknown action: $::action\n$::usage\n");