mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-11-26 02:19:26 +01:00
auto-t: combine testBSSBlacklist tests
All 4 tests were combined to reuse hwsim rule code, and improve cleanup between running tests.
This commit is contained in:
parent
b252b65ee0
commit
db9f001865
@ -1,97 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
import unittest
|
||||
import sys
|
||||
|
||||
sys.path.append('../util')
|
||||
import iwd
|
||||
from iwd import IWD
|
||||
from iwd import PSKAgent
|
||||
from iwd import NetworkType
|
||||
|
||||
from hostapd import HostapdCLI
|
||||
from hwsim import Hwsim
|
||||
|
||||
class Test(unittest.TestCase):
|
||||
|
||||
def test_connection_success(self):
|
||||
hwsim = Hwsim()
|
||||
|
||||
bss_hostapd = [ HostapdCLI(config='ssid1.conf'),
|
||||
HostapdCLI(config='ssid2.conf'),
|
||||
HostapdCLI(config='ssid3.conf') ]
|
||||
bss_radio = [ hwsim.get_radio('rad0'),
|
||||
hwsim.get_radio('rad1'),
|
||||
hwsim.get_radio('rad2') ]
|
||||
|
||||
rule0 = hwsim.rules.create()
|
||||
rule0.source = bss_radio[0].addresses[0]
|
||||
rule0.bidirectional = True
|
||||
rule0.signal = -2000
|
||||
|
||||
rule1 = hwsim.rules.create()
|
||||
rule1.source = bss_radio[1].addresses[0]
|
||||
rule1.bidirectional = True
|
||||
rule1.signal = -8000
|
||||
|
||||
rule2 = hwsim.rules.create()
|
||||
rule2.source = bss_radio[2].addresses[0]
|
||||
rule2.bidirectional = True
|
||||
rule2.signal = -9000
|
||||
|
||||
wd = IWD(True)
|
||||
|
||||
psk_agent = PSKAgent(["secret123", 'secret123'])
|
||||
wd.register_psk_agent(psk_agent)
|
||||
|
||||
devices = wd.list_devices(1)
|
||||
device = devices[0]
|
||||
|
||||
ordered_network = device.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
# Have both APs drop all packets, both should get blacklisted
|
||||
rule0.drop = True
|
||||
rule1.drop = True
|
||||
rule2.drop = True
|
||||
|
||||
with self.assertRaises(iwd.FailedEx):
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
rule0.drop = False
|
||||
rule1.drop = False
|
||||
rule2.drop = False
|
||||
|
||||
# Wait for scanning (likely a quick-scan) to finish, otherwise we will
|
||||
# may not have all BSS's in the list.
|
||||
condition = 'not obj.scanning'
|
||||
wd.wait_for_object_condition(device, condition)
|
||||
|
||||
# This connect should work
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(device, condition)
|
||||
|
||||
self.assertIn(device.address, bss_hostapd[0].list_sta())
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
rule0.remove()
|
||||
rule1.remove()
|
||||
rule2.remove()
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
pass
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
IWD.clear_storage()
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main(exit=True)
|
@ -1,90 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
import unittest
|
||||
import sys
|
||||
|
||||
sys.path.append('../util')
|
||||
import iwd
|
||||
from iwd import IWD
|
||||
from iwd import PSKAgent
|
||||
from iwd import NetworkType
|
||||
|
||||
from hostapd import HostapdCLI
|
||||
from hwsim import Hwsim
|
||||
|
||||
class Test(unittest.TestCase):
|
||||
|
||||
def test_connection_success(self):
|
||||
hwsim = Hwsim()
|
||||
|
||||
bss_hostapd = [ HostapdCLI(config='ssid1.conf'),
|
||||
HostapdCLI(config='ssid2.conf'),
|
||||
HostapdCLI(config='ssid3.conf') ]
|
||||
bss_radio = [ hwsim.get_radio('rad0'),
|
||||
hwsim.get_radio('rad1'),
|
||||
hwsim.get_radio('rad2') ]
|
||||
|
||||
rule0 = hwsim.rules.create()
|
||||
rule0.source = bss_radio[0].addresses[0]
|
||||
rule0.bidirectional = True
|
||||
rule0.signal = -2000
|
||||
|
||||
rule1 = hwsim.rules.create()
|
||||
rule1.source = bss_radio[1].addresses[0]
|
||||
rule1.bidirectional = True
|
||||
rule1.signal = -7000
|
||||
|
||||
rule2 = hwsim.rules.create()
|
||||
rule2.source = bss_radio[2].addresses[0]
|
||||
rule2.bidirectional = True
|
||||
rule2.signal = -8000
|
||||
|
||||
wd = IWD(True)
|
||||
|
||||
psk_agent = PSKAgent("wrong_password")
|
||||
wd.register_psk_agent(psk_agent)
|
||||
|
||||
devices = wd.list_devices(1)
|
||||
device = devices[0]
|
||||
|
||||
ordered_network = device.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
with self.assertRaises(iwd.FailedEx):
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
psk_agent = PSKAgent("secret123")
|
||||
wd.register_psk_agent(psk_agent)
|
||||
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
# We failed to connect bss_hostapd[0], but with a bad password. Verify
|
||||
# that this did not trigger a blacklist and that we did reconnect
|
||||
# successfully to bss_hostapd[0]
|
||||
self.assertIn(device.address, bss_hostapd[0].list_sta())
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(device, condition)
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
rule0.remove()
|
||||
rule1.remove()
|
||||
rule2.remove()
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
pass
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
IWD.clear_storage()
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main(exit=True)
|
@ -8,6 +8,7 @@ import iwd
|
||||
from iwd import IWD
|
||||
from iwd import PSKAgent
|
||||
from iwd import NetworkType
|
||||
from iwd import IWD_CONFIG_DIR
|
||||
|
||||
from hostapd import HostapdCLI
|
||||
from hwsim import Hwsim
|
||||
@ -15,33 +16,166 @@ from hwsim import Hwsim
|
||||
import time
|
||||
|
||||
class Test(unittest.TestCase):
|
||||
def test_temp_blacklist(self):
|
||||
rule0 = self.rule0
|
||||
rule1 = self.rule1
|
||||
rule2 = self.rule2
|
||||
|
||||
bss_hostapd = self.bss_hostapd
|
||||
wd = self.wd
|
||||
|
||||
rule0.signal = -8000
|
||||
rule1.signal = -7000
|
||||
rule2.signal = -2000
|
||||
|
||||
psk_agent = PSKAgent("secret123")
|
||||
wd.register_psk_agent(psk_agent)
|
||||
|
||||
dev1, dev2 = wd.list_devices(2)
|
||||
|
||||
ordered_network = dev1.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(dev1, condition)
|
||||
|
||||
self.assertIn(dev1.address, bss_hostapd[2].list_sta())
|
||||
|
||||
# dev1 now connected, this should max out the first AP, causing the next
|
||||
# connection to fail to this AP.
|
||||
|
||||
ordered_network = dev2.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(dev2, condition)
|
||||
|
||||
# We should have temporarily blacklisted the first BSS, and connected
|
||||
# to this one.
|
||||
self.assertIn(dev2.address, bss_hostapd[1].list_sta())
|
||||
|
||||
# Now check that the first BSS is still not blacklisted. We can
|
||||
# disconnect dev1, opening up the AP for more connections
|
||||
dev1.disconnect()
|
||||
dev2.disconnect()
|
||||
|
||||
ordered_network = dev2.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(dev2, condition)
|
||||
|
||||
self.assertIn(dev2.address, bss_hostapd[2].list_sta())
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
def test_all_blacklisted(self):
|
||||
wd = self.wd
|
||||
bss_hostapd = self.bss_hostapd
|
||||
|
||||
rule0 = self.rule0
|
||||
rule1 = self.rule1
|
||||
rule2 = self.rule2
|
||||
|
||||
psk_agent = PSKAgent(["secret123", 'secret123'])
|
||||
wd.register_psk_agent(psk_agent)
|
||||
|
||||
devices = wd.list_devices(1)
|
||||
device = devices[0]
|
||||
|
||||
ordered_network = device.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
# Have both APs drop all packets, both should get blacklisted
|
||||
rule0.drop = True
|
||||
rule1.drop = True
|
||||
rule2.drop = True
|
||||
|
||||
with self.assertRaises(iwd.FailedEx):
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
rule0.drop = False
|
||||
rule1.drop = False
|
||||
rule2.drop = False
|
||||
|
||||
# Wait for scanning (likely a quick-scan) to finish, otherwise we will
|
||||
# may not have all BSS's in the list.
|
||||
condition = 'not obj.scanning'
|
||||
wd.wait_for_object_condition(device, condition)
|
||||
|
||||
# This connect should work
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(device, condition)
|
||||
|
||||
self.assertIn(device.address, bss_hostapd[0].list_sta())
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
def test_invalid_password(self):
|
||||
wd = self.wd
|
||||
bss_hostapd = self.bss_hostapd
|
||||
|
||||
psk_agent = PSKAgent("wrong_password")
|
||||
wd.register_psk_agent(psk_agent)
|
||||
|
||||
devices = wd.list_devices(1)
|
||||
device = devices[0]
|
||||
|
||||
ordered_network = device.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
with self.assertRaises(iwd.FailedEx):
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
psk_agent = PSKAgent("secret123")
|
||||
wd.register_psk_agent(psk_agent)
|
||||
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
# We failed to connect bss_hostapd[0], but with a bad password. Verify
|
||||
# that this did not trigger a blacklist and that we did reconnect
|
||||
# successfully to bss_hostapd[0]
|
||||
self.assertIn(device.address, bss_hostapd[0].list_sta())
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(device, condition)
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
def test_connection_success(self):
|
||||
hwsim = Hwsim()
|
||||
|
||||
bss_hostapd = [ HostapdCLI(config='ssid1.conf'),
|
||||
HostapdCLI(config='ssid2.conf'),
|
||||
HostapdCLI(config='ssid3.conf') ]
|
||||
bss_radio = [ hwsim.get_radio('rad0'),
|
||||
hwsim.get_radio('rad1'),
|
||||
hwsim.get_radio('rad2') ]
|
||||
|
||||
rule0 = hwsim.rules.create()
|
||||
rule0.source = bss_radio[0].addresses[0]
|
||||
rule0.bidirectional = True
|
||||
rule0.signal = -2000
|
||||
|
||||
rule1 = hwsim.rules.create()
|
||||
rule1.source = bss_radio[1].addresses[0]
|
||||
rule1.bidirectional = True
|
||||
rule1.signal = -7000
|
||||
|
||||
rule2 = hwsim.rules.create()
|
||||
rule2.source = bss_radio[2].addresses[0]
|
||||
rule2.bidirectional = True
|
||||
rule2.signal = -8000
|
||||
|
||||
wd = IWD(True)
|
||||
wd = self.wd
|
||||
bss_hostapd = self.bss_hostapd
|
||||
rule0 = self.rule0
|
||||
|
||||
psk_agent = PSKAgent("secret123")
|
||||
wd.register_psk_agent(psk_agent)
|
||||
@ -129,19 +263,49 @@ class Test(unittest.TestCase):
|
||||
|
||||
self.assertIn(device.address, bss_hostapd[0].list_sta())
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
self.wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
rule0.remove()
|
||||
rule1.remove()
|
||||
rule2.remove()
|
||||
def setUp(self):
|
||||
self.wd = IWD(True)
|
||||
|
||||
def tearDown(self):
|
||||
IWD.clear_storage()
|
||||
self.wd = None
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
IWD.copy_to_storage('main.conf')
|
||||
cls.hwsim = Hwsim()
|
||||
|
||||
cls.bss_hostapd = [ HostapdCLI(config='ssid1.conf'),
|
||||
HostapdCLI(config='ssid2.conf'),
|
||||
HostapdCLI(config='ssid3.conf') ]
|
||||
cls.bss_radio = [ cls.hwsim.get_radio('rad0'),
|
||||
cls.hwsim.get_radio('rad1'),
|
||||
cls.hwsim.get_radio('rad2') ]
|
||||
|
||||
cls.rule0 = cls.hwsim.rules.create()
|
||||
cls.rule0.source = cls.bss_radio[0].addresses[0]
|
||||
cls.rule0.bidirectional = True
|
||||
cls.rule0.signal = -2000
|
||||
cls.rule0.enabled = True
|
||||
|
||||
cls.rule1 = cls.hwsim.rules.create()
|
||||
cls.rule1.source = cls.bss_radio[1].addresses[0]
|
||||
cls.rule1.bidirectional = True
|
||||
cls.rule1.signal = -7000
|
||||
cls.rule1.enabled = True
|
||||
|
||||
cls.rule2 = cls.hwsim.rules.create()
|
||||
cls.rule2.source = cls.bss_radio[2].addresses[0]
|
||||
cls.rule2.bidirectional = True
|
||||
cls.rule2.signal = -8000
|
||||
cls.rule2.enabled = True
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
IWD.clear_storage()
|
||||
|
||||
cls.hwsim.rules.remove_all()
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main(exit=True)
|
||||
|
@ -1,116 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
|
||||
import unittest
|
||||
import sys
|
||||
|
||||
sys.path.append('../util')
|
||||
import iwd
|
||||
from iwd import IWD
|
||||
from iwd import PSKAgent
|
||||
from iwd import NetworkType
|
||||
|
||||
from hostapd import HostapdCLI
|
||||
from hwsim import Hwsim
|
||||
|
||||
class Test(unittest.TestCase):
|
||||
|
||||
def test_connection_success(self):
|
||||
hwsim = Hwsim()
|
||||
|
||||
bss_hostapd = [ HostapdCLI(config='ssid1.conf'),
|
||||
HostapdCLI(config='ssid2.conf'),
|
||||
HostapdCLI(config='ssid3.conf') ]
|
||||
bss_radio = [ hwsim.get_radio('rad0'),
|
||||
hwsim.get_radio('rad1'),
|
||||
hwsim.get_radio('rad2') ]
|
||||
|
||||
rule0 = hwsim.rules.create()
|
||||
rule0.source = bss_radio[0].addresses[0]
|
||||
rule0.bidirectional = True
|
||||
rule0.signal = -8000
|
||||
|
||||
rule1 = hwsim.rules.create()
|
||||
rule1.source = bss_radio[1].addresses[0]
|
||||
rule1.bidirectional = True
|
||||
rule1.signal = -7000
|
||||
|
||||
rule2 = hwsim.rules.create()
|
||||
rule2.source = bss_radio[2].addresses[0]
|
||||
rule2.bidirectional = True
|
||||
rule2.signal = -2000
|
||||
|
||||
wd = IWD(True)
|
||||
|
||||
psk_agent = PSKAgent("secret123")
|
||||
wd.register_psk_agent(psk_agent)
|
||||
|
||||
dev1, dev2 = wd.list_devices(2)
|
||||
|
||||
ordered_network = dev1.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(dev1, condition)
|
||||
|
||||
self.assertIn(dev1.address, bss_hostapd[2].list_sta())
|
||||
|
||||
# dev1 now connected, this should max out the first AP, causing the next
|
||||
# connection to fail to this AP.
|
||||
|
||||
ordered_network = dev2.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(dev2, condition)
|
||||
|
||||
# We should have temporarily blacklisted the first BSS, and connected
|
||||
# to this one.
|
||||
self.assertIn(dev2.address, bss_hostapd[1].list_sta())
|
||||
|
||||
# Now check that the first BSS is still not blacklisted. We can
|
||||
# disconnect dev1, opening up the AP for more connections
|
||||
dev1.disconnect()
|
||||
dev2.disconnect()
|
||||
|
||||
ordered_network = dev2.get_ordered_network("TestBlacklist")
|
||||
|
||||
self.assertEqual(ordered_network.type, NetworkType.psk)
|
||||
|
||||
condition = 'not obj.connected'
|
||||
wd.wait_for_object_condition(ordered_network.network_object, condition)
|
||||
|
||||
ordered_network.network_object.connect()
|
||||
|
||||
condition = 'obj.state == DeviceState.connected'
|
||||
wd.wait_for_object_condition(dev2, condition)
|
||||
|
||||
self.assertIn(dev2.address, bss_hostapd[2].list_sta())
|
||||
|
||||
wd.unregister_psk_agent(psk_agent)
|
||||
|
||||
rule0.remove()
|
||||
rule1.remove()
|
||||
rule2.remove()
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
IWD.copy_to_storage('main.conf')
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
IWD.clear_storage()
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main(exit=True)
|
Loading…
Reference in New Issue
Block a user