jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Wait longer for program deinit

Browse source 
Wait a bit longer for wpa_supplicant/hostapd to exit and clear control
interface files separately if either any of the cleanup steps fail to do
so.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-08-27 16:02:15 +03:00
parent 15f7b02c95
commit 18ece3133e
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/hwsim/stop-wifi.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
if pidof wpa_supplicant hostapd > /dev/null; then if pidof wpa_supplicant hostapd valgrind.bin > /dev/null; then
RUNNING=yes RUNNING=yes
else else
RUNNING=no RUNNING=no
@ -21,7 +21,7 @@ fi
if [ "$RUNNING" = "yes" ]; then if [ "$RUNNING" = "yes" ]; then
# give some time for hostapd and wpa_supplicant to complete deinit # give some time for hostapd and wpa_supplicant to complete deinit
sleep 2 sleep 4
fi fi
if pidof wpa_supplicant hostapd > /dev/null; then if pidof wpa_supplicant hostapd > /dev/null; then
@ -38,6 +38,16 @@ for i in `pidof valgrind.bin`; do
fi fi
done done
for i in /tmp/wpas-wlan0 /tmp/wpas-wlan1 /tmp/wpas-wlan2 /var/run/hostapd-global; do
if [ -e $i ]; then
sleep 1
if [ -e $i ]; then
echo "Control interface file $i exists - remove it"
sudo rm $i
fi
fi
done
if grep -q mac80211_hwsim /proc/modules ; then if grep -q mac80211_hwsim /proc/modules ; then
sudo rmmod mac80211_hwsim sudo rmmod mac80211_hwsim
# wait at the end to avoid issues starting something new immediately after # wait at the end to avoid issues starting something new immediately after