Try this again (with a longer timeout and more diagnostic info)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21811 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/test/config.sh b/test/config.sh
index cb640b1c6c099d9333e13e6a45383e42d60a837a..aec0a04b343fccc6449af5e4ef990dcb9218c1cb 100755 (executable)
--- a/test/config.sh
+++ b/test/config.sh
@@ -57,7 +57,7 @@ TRAFFIC_CAPTURE_IFACE=${TRAFFIC_CAPTURE_IFACE:-1}
 
 # time to capture some traffic (in seconds)
 # (you may increase this if you get errors caused by very low traffic)
-TRAFFIC_CAPTURE_DURATION=20
+TRAFFIC_CAPTURE_DURATION=60
 
 # the default is to not capture in promiscuous mode
 # (this makes known trouble with some Windows WLAN adapters)

diff --git a/test/suite-capture.sh b/test/suite-capture.sh
index 2c25b248cd01bac5ad8ba57fc8cae15b715d8671..af26c3a38520330995b7fea55a0f7c7881db7099 100755 (executable)
--- a/test/suite-capture.sh
+++ b/test/suite-capture.sh
@@ -43,9 +43,15 @@ capture_test_output_print() {
 traffic_gen_ping() {
        # Generate some traffic for quiet networks.
        # This will have to be adjusted for non-Windows systems.
-##     ping -n 20 www.wireshark.org > /dev/null 2>&1 &
-
-       { date; ping -n 20 www.wireshark.org; date; } > ./testout_ping.txt 2>&1 &
+       {
+       date 
+       for (( x=20; x<=50; x++ ))
+       do
+               ping -n 1 -l $x www.wireshark.org # in effect: number the packets
+               sleep 1
+       done
+       date
+       } > ./testout_ping.txt 2>&1 &
 }
 
 ping_cleanup() {
@@ -95,6 +101,7 @@ capture_step_10packets() {
                test_step_ok
        else
                echo
+                $TSHARK -ta -r ./testout.pcap >> ./testout2.txt
                capture_test_output_print ./testout_ping.txt ./testout.txt ./testout2.txt
                # part of the Prerequisite checks
                # probably wrong interface, output the possible interfaces
@@ -288,7 +295,7 @@ capture_step_snapshot() {
        traffic_gen_ping
 
        # capture with a snapshot length of 68 bytes for $TRAFFIC_CAPTURE_DURATION seconds
-       # this should result in no packets
+       # this should result in no packets greater than 68 bytes
        date > ./testout.txt
        $DUT -i $TRAFFIC_CAPTURE_IFACE $TRAFFIC_CAPTURE_PROMISC \
                -w ./testout.pcap \
@@ -378,6 +385,6 @@ capture_suite() {
        test_step_set_post capture_cleanup_step
        test_remark_add "Capture - need some traffic on interface: \"$TRAFFIC_CAPTURE_IFACE\""
        test_suite_add "TShark capture" tshark_capture_suite
-##     test_suite_add "Wireshark capture" wireshark_capture_suite
+       test_suite_add "Wireshark capture" wireshark_capture_suite
        test_suite_add "Dumpcap capture" dumpcap_capture_suite
 }