diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-11-21 17:54:14 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-11-21 17:54:14 +0000 |
| commit | 6a205fd224a30bd2880392c910c6f41d75327d82 (patch) | |
| tree | d79b2c6efca38181139300efe32cd96ac2de8899 /test/suite-clopts.sh | |
| parent | 4c019d6807d975ae6d8b0f27311c7ed844ac3c7f (diff) | |
Give a better failure message for the cases where a test failed not
because of an incorrect exit status but because of the error message not
being what we expected.
Include the name of the program being tested in the capture
filter/interface options tests.
svn path=/trunk/; revision=46110
Diffstat (limited to 'test/suite-clopts.sh')
| -rwxr-xr-x | test/suite-clopts.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/test/suite-clopts.sh b/test/suite-clopts.sh index 5a534792b3..c6118c559c 100755 --- a/test/suite-clopts.sh +++ b/test/suite-clopts.sh @@ -102,7 +102,7 @@ clopts_step_dumpcap_invalid_capfilter() { test_step_ok else test_step_output_print ./testout.txt - test_step_failed "Infos" + test_step_failed "Unexpected error message" fi fi } @@ -120,7 +120,7 @@ clopts_step_dumpcap_invalid_interfaces() { test_step_ok else test_step_output_print ./testout.txt - test_step_failed "Infos" + test_step_failed "Unexpected error message" fi fi } @@ -138,7 +138,7 @@ clopts_step_dumpcap_invalid_interfaces_index() { test_step_ok else test_step_output_print ./testout.txt - test_step_failed "Infos" + test_step_failed "Unexpected error message" fi fi } @@ -221,7 +221,7 @@ clopts_step_tshark_invalid_capfilter() { test_step_ok else test_step_output_print ./testout.txt - test_step_failed "Infos" + test_step_failed "Unexpected error message" fi fi } @@ -239,7 +239,7 @@ clopts_step_tshark_invalid_interfaces() { test_step_ok else test_step_output_print ./testout.txt - test_step_failed "Infos" + test_step_failed "Unexpected error message" fi fi } @@ -257,7 +257,7 @@ clopts_step_tshark_invalid_interfaces_index() { test_step_ok else test_step_output_print ./testout.txt - test_step_failed "Infos" + test_step_failed "Unexpected error message" fi fi } @@ -285,16 +285,16 @@ clopts_suite_basic() { test_step_add "Exit status for none existing files must be 2" clopts_step_nonexisting_file } -clopts_suite_tshark_capture_options() { - test_step_add "Invalid capture filter -f" clopts_step_tshark_invalid_capfilter - test_step_add "Invalid capture interface -i" clopts_step_tshark_invalid_interfaces - test_step_add "Invalid capture interface index 0" clopts_step_tshark_invalid_interfaces_index +clopts_suite_dumpcap_capture_options() { + test_step_add "Invalid dumpcap capture filter -f" clopts_step_dumpcap_invalid_capfilter + test_step_add "Invalid dumpcap capture interface -i" clopts_step_dumpcap_invalid_interfaces + test_step_add "Invalid dumpcap capture interface index 0" clopts_step_dumpcap_invalid_interfaces_index } -clopts_suite_dumpcap_capture_options() { - test_step_add "Invalid capture filter -f" clopts_step_dumpcap_invalid_capfilter - test_step_add "Invalid capture interface -i" clopts_step_dumpcap_invalid_interfaces - test_step_add "Invalid capture interface index 0" clopts_step_dumpcap_invalid_interfaces_index +clopts_suite_tshark_capture_options() { + test_step_add "Invalid TShark capture filter -f" clopts_step_tshark_invalid_capfilter + test_step_add "Invalid TShark capture interface -i" clopts_step_tshark_invalid_interfaces + test_step_add "Invalid TShark capture interface index 0" clopts_step_tshark_invalid_interfaces_index } clopts_post_step() { |