osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

For invalid interfaces, just check for "The capture session could not be 

initiated", as we used to do.

svn path=/trunk/; revision=46117
This commit is contained in:
Guy Harris 2012-11-21 19:01:16 +00:00
parent 6871a7bb1c
commit 7714813e0e
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/suite-clopts.sh
View File

@ -114,11 +114,7 @@ clopts_step_dumpcap_invalid_interfaces() {
if [ ! $RETURNVALUE -eq $EXIT_COMMAND_LINE ]; then
test_step_failed "exit status: $RETURNVALUE"
else
if [ "$WS_SYSTEM" = "Windows" ] ; then
grep -i 'The capture session could not be initiated (Error opening adapter: The system cannot find the device specified. (20)).' ./testout.txt > /dev/null
else
grep -i "The capture session could not be initiated (You don't have permission to capture on that device)." ./testout.txt > /dev/null
fi
grep -i 'The capture session could not be initiated' ./testout.txt > /dev/null
if [ $? -eq 0 ]; then
test_step_output_print ./testout.txt
test_step_ok
@ -237,11 +233,7 @@ clopts_step_tshark_invalid_interfaces() {
if [ ! $RETURNVALUE -eq $EXIT_COMMAND_LINE ]; then
test_step_failed "exit status: $RETURNVALUE"
else
if [ "$WS_SYSTEM" = "Windows" ] ; then
grep -i 'The capture session could not be initiated (Error opening adapter: The system cannot find the device specified. (20)).' ./testout.txt > /dev/null
else
grep -i "The capture session could not be initiated (You don't have permission to capture on that device)." ./testout.txt > /dev/null
fi
grep -i 'The capture session could not be initiated' ./testout.txt > /dev/null
if [ $? -eq 0 ]; then
test_step_output_print ./testout.txt
test_step_ok