autotests: Extend a testP2P timeout
PATCH 1/2 autotests: Extend a testP2P timeout
With various versions of wpa_supplicant tested, after an IWD GO tears the group down, the wpa_supplicant P2P client will not immediately signal that the group has disappeared but will at least wait for the lost beacon signal, wait some more and try reconnecting and all that takes it 10s or a little longer. Possibly sending Deauthenticate frames to clients first would improve this.
--- autotests/testP2P/connection_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
autotests/testP2P/connection_test.py +1 -1
@@ -130,7 +130,7 @@ class Test(unittest.TestCase): if not go: wd.wait_for_object_condition(wpas, 'len(obj.p2p_clients) == 0', max_wait=3) else: - wd.wait_for_object_condition(wpas, 'obj.p2p_group is None', max_wait=3) + wd.wait_for_object_condition(wpas, 'obj.p2p_group is None', max_wait=15) self.assertEqual(peer.connected, False) def setUp(self):
Signature · 1 line
2.30.2
PATCH 2/2 autotests: Don't use the netifaces module
Get rid of a dependency on a package that needed to be manually installed.
--- autotests/testP2P/connection_test.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
autotests/testP2P/connection_test.py +5 -8
@@ -2,7 +2,6 @@ import unittest import sys -import netifaces import os import time
@@ -112,16 +111,14 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(peer, 'obj.connected', max_wait=15) time.sleep(1) # Give the client time to set the IP - our_ip = netifaces.ifaddresses(peer.connected_interface)[netifaces.AF_INET][0]['addr'] - peer_ip = netifaces.ifaddresses(peer_ifname)[netifaces.AF_INET][0]['addr'] - self.assertEqual(peer.connected_ip, peer_ip) + testutil.test_ip_address_match(peer_ifname, peer.connected_ip) if not go: - self.assertEqual(our_ip, '192.168.1.30') - self.assertEqual(peer_ip, '192.168.1.20') + testutil.test_ip_address_match(peer.connected_interface, '192.168.1.30') + self.assertEqual(peer.connected_ip, '192.168.1.20') else: - self.assertEqual(our_ip, '192.168.1.1') - self.assertEqual(peer_ip, '192.168.1.2') + testutil.test_ip_address_match(peer.connected_interface, '192.168.1.1') + self.assertEqual(peer.connected_ip, '192.168.1.2') testutil.test_iface_operstate(peer.connected_interface) testutil.test_ifaces_connected(peer.connected_interface, peer_ifname)
Signature · 1 line
2.30.2
Hi Andrew,
Quoted 10 lines · Andrew Zaborowski
With various versions of
wpa_supplicanttested, after an IWD GO tears the group down, thewpa_supplicantP2P client will not immediately signal that the group has disappeared but will at least wait for the lost beacon signal, wait some more and try reconnecting and all that takes it 10s or a little longer. Possibly sending Deauthenticate frames to clients first would improve this.--- autotests/testP2P/connection_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Both applied, thanks.
Regards,
-Denis