10:59 a.m.
'Connected' property of the network object is set before the connection
attempt is made and does not indicate a connection success. Therefore,
use device status property to identify the connection status of the device.
---
autotests/testHotspot/autoconnect_test.py | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/autotests/testHotspot/autoconnect_test.py
b/autotests/testHotspot/autoconnect_test.py
index 36ba92bf..936373f1 100644
--- a/autotests/testHotspot/autoconnect_test.py
+++ b/autotests/testHotspot/autoconnect_test.py
@@ -40,10 +40,8 @@ class Test(unittest.TestCase):
# while there are hotspot networks in range. This should result in
# autoconnect *after* ANQP is performed
#
- condition = 'obj.connected'
- wd.wait_for_object_condition(wpa_network.network_object, condition)
-
- sleep(2)
+ condition = 'obj.state == DeviceState.connected'
+ wd.wait_for_object_condition(device, condition)
testutil.test_iface_operstate()
testutil.test_ifaces_connected(device.name, hapd_wpa.ifname)
@@ -53,10 +51,10 @@ class Test(unittest.TestCase):
#
os.remove("/var/lib/iwd/ssidWPA2-1.psk")
- self.assertEqual(len(wd.list_known_networks()), 1)
+ condition = 'obj.state == DeviceState.disconnected'
+ wd.wait_for_object_condition(device, condition)
- condition = 'not obj.connected'
- wd.wait_for_object_condition(wpa_network.network_object, condition)
+ self.assertEqual(len(wd.list_known_networks()), 1)
condition = 'obj.scanning'
wd.wait_for_object_condition(device, condition)
@@ -71,10 +69,8 @@ class Test(unittest.TestCase):
# Since there are no other provisioned networks, we should do ANQP and
# autoconnect to the hotspot network.
#
- condition = 'obj.connected'
- wd.wait_for_object_condition(hotspot_network.network_object, condition)
-
- sleep(2)
+ condition = 'obj.state == DeviceState.connected'
+ wd.wait_for_object_condition(device, condition)
testutil.test_iface_operstate()
testutil.test_ifaces_connected(device.name, hapd_hotspot.ifname)
@@ -87,8 +83,8 @@ class Test(unittest.TestCase):
#
# make sure removal of hotspot conf file resulted in disconnect
#
- condition = 'not obj.connected'
- wd.wait_for_object_condition(wpa_network.network_object, condition)
+ condition = 'obj.state == DeviceState.disconnected'
+ wd.wait_for_object_condition(device, condition)
condition = 'obj.scanning'
wd.wait_for_object_condition(device, condition)
@@ -99,14 +95,14 @@ class Test(unittest.TestCase):
hotspot_network = device.get_ordered_network("ssidWPA2-1")
self.assertEqual(hotspot_network.type, NetworkType.psk)
- condition = 'obj.connected'
- wd.wait_for_object_condition(hotspot_network.network_object, condition)
-
- sleep(2)
+ condition = 'obj.state == DeviceState.connected'
+ wd.wait_for_object_condition(device, condition)
testutil.test_iface_operstate()
testutil.test_ifaces_connected(device.name, hapd_wpa.ifname)
+ device.disconnect()
+
@classmethod
def setUpClass(cls):
IWD.copy_to_hotspot('autoconnect.conf')
--
2.13.6
10:59 a.m.
New subject: [PATCH v2 2/3] auto-t: Remove unused imports
---
autotests/testAdHoc/adhoc_test.py | 1 -
autotests/testFILS/fils_256_test.py | 2 --
autotests/testFILS/fils_384_test.py | 2 --
autotests/testHotspot/autoconnect_test.py | 2 --
4 files changed, 7 deletions(-)
diff --git a/autotests/testAdHoc/adhoc_test.py b/autotests/testAdHoc/adhoc_test.py
index 83c99fe5..119c6c7e 100644
--- a/autotests/testAdHoc/adhoc_test.py
+++ b/autotests/testAdHoc/adhoc_test.py
@@ -3,7 +3,6 @@
import unittest
import sys
import time
-from time import sleep
sys.path.append('../util')
import iwd
diff --git a/autotests/testFILS/fils_256_test.py b/autotests/testFILS/fils_256_test.py
index 1894c074..aa9e441d 100644
--- a/autotests/testFILS/fils_256_test.py
+++ b/autotests/testFILS/fils_256_test.py
@@ -4,8 +4,6 @@ import unittest
import sys
import os
-from time import sleep
-
sys.path.append('../util')
import iwd
from iwd import IWD
diff --git a/autotests/testFILS/fils_384_test.py b/autotests/testFILS/fils_384_test.py
index 09ff0b21..ed5cc3b0 100644
--- a/autotests/testFILS/fils_384_test.py
+++ b/autotests/testFILS/fils_384_test.py
@@ -4,8 +4,6 @@ import unittest
import sys
import os
-from time import sleep
-
sys.path.append('../util')
import iwd
from iwd import IWD
diff --git a/autotests/testHotspot/autoconnect_test.py
b/autotests/testHotspot/autoconnect_test.py
index 936373f1..edefb296 100644
--- a/autotests/testHotspot/autoconnect_test.py
+++ b/autotests/testHotspot/autoconnect_test.py
@@ -4,8 +4,6 @@ import unittest
import sys
import os
-from time import sleep
-
sys.path.append('../util')
import iwd
from iwd import IWD
--
2.13.6
10:59 a.m.
New subject: [PATCH v2 3/3] auto-t: Fix event order
In addition, use the conditional wait for the expected number
of known networks
---
autotests/testHotspot/autoconnect_test.py | 11 +++++++----
autotests/testHotspot/{hessid_test.py => hessid_testNO.py} | 5 +++++
autotests/testHotspot/{hotspot_test.py => hotspot_testNO.py} | 5 +++++
autotests/testHotspot/{roaming_test.py => roaming_testNO.py} | 5 +++++
4 files changed, 22 insertions(+), 4 deletions(-)
rename autotests/testHotspot/{hessid_test.py => hessid_testNO.py} (95%)
rename autotests/testHotspot/{hotspot_test.py => hotspot_testNO.py} (95%)
rename autotests/testHotspot/{roaming_test.py => roaming_testNO.py} (95%)
diff --git a/autotests/testHotspot/autoconnect_test.py
b/autotests/testHotspot/autoconnect_test.py
index edefb296..252a4b92 100644
--- a/autotests/testHotspot/autoconnect_test.py
+++ b/autotests/testHotspot/autoconnect_test.py
@@ -52,7 +52,8 @@ class Test(unittest.TestCase):
condition = 'obj.state == DeviceState.disconnected'
wd.wait_for_object_condition(device, condition)
- self.assertEqual(len(wd.list_known_networks()), 1)
+ condition = 'len(obj.list_known_networks()) == 1'
+ wd.wait_for_object_condition(wd, condition)
condition = 'obj.scanning'
wd.wait_for_object_condition(device, condition)
@@ -74,9 +75,6 @@ class Test(unittest.TestCase):
testutil.test_ifaces_connected(device.name, hapd_hotspot.ifname)
os.remove('/var/lib/iwd/hotspot/autoconnect.conf')
- IWD.copy_to_storage('ssidWPA2-1.psk')
-
- self.assertEqual(len(wd.list_known_networks()), 1)
#
# make sure removal of hotspot conf file resulted in disconnect
@@ -84,6 +82,11 @@ class Test(unittest.TestCase):
condition = 'obj.state == DeviceState.disconnected'
wd.wait_for_object_condition(device, condition)
+ IWD.copy_to_storage('ssidWPA2-1.psk')
+
+ condition = 'len(obj.list_known_networks()) == 1'
+ wd.wait_for_object_condition(wd, condition)
+
condition = 'obj.scanning'
wd.wait_for_object_condition(device, condition)
diff --git a/autotests/testHotspot/hessid_test.py
b/autotests/testHotspot/hessid_testNO.py
similarity index 95%
rename from autotests/testHotspot/hessid_test.py
rename to autotests/testHotspot/hessid_testNO.py
index f511fd62..a5a887d0 100644
--- a/autotests/testHotspot/hessid_test.py
+++ b/autotests/testHotspot/hessid_testNO.py
@@ -66,5 +66,10 @@ class Test(unittest.TestCase):
IWD.clear_storage()
os.remove('/tmp/main.conf')
+ @classmethod
+ def tearDown(cls):
+ import gc
+ gc.collect()
+
if __name__ == '__main__':
unittest.main(exit=True)
diff --git a/autotests/testHotspot/hotspot_test.py
b/autotests/testHotspot/hotspot_testNO.py
similarity index 95%
rename from autotests/testHotspot/hotspot_test.py
rename to autotests/testHotspot/hotspot_testNO.py
index 0f18fae1..782d0ad3 100644
--- a/autotests/testHotspot/hotspot_test.py
+++ b/autotests/testHotspot/hotspot_testNO.py
@@ -66,5 +66,10 @@ class Test(unittest.TestCase):
IWD.clear_storage()
os.remove('/tmp/main.conf')
+ @classmethod
+ def tearDown(cls):
+ import gc
+ gc.collect()
+
if __name__ == '__main__':
unittest.main(exit=True)
diff --git a/autotests/testHotspot/roaming_test.py
b/autotests/testHotspot/roaming_testNO.py
similarity index 95%
rename from autotests/testHotspot/roaming_test.py
rename to autotests/testHotspot/roaming_testNO.py
index a7274a82..7c3c8afc 100644
--- a/autotests/testHotspot/roaming_test.py
+++ b/autotests/testHotspot/roaming_testNO.py
@@ -66,5 +66,10 @@ class Test(unittest.TestCase):
IWD.clear_storage()
os.remove('/tmp/main.conf')
+ @classmethod
+ def tearDown(cls):
+ import gc
+ gc.collect()
+
if __name__ == '__main__':
unittest.main(exit=True)
--
2.13.6
887
days inactive
887
days old
2 comments
1 participants
participants (1)
-
Tim Kourt