Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-11 10:12:42 +01:00
Code Releases Activity

auto-t: removed ';' from many autotests

Browse Source 
At some point a stray ';' got added into an autotest in a section
of code that is heavily copy pasted. So in turn nearly all the autotests
have this stray ';' after list_devices (and a few in other places).
This commit is contained in:
James Prestwood 2018-12-14 11:15:26 -08:00 committed by Denis Kenzior
parent c2094c5e04
commit 699b83cb1f
51 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotests/testAPRoam/connection_test.py
View File

@ -48,7 +48,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("secret123")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testConnectAutoconnect/validation.py
View File

@ -60,7 +60,7 @@ class TestConnectAutoconnect(unittest.TestCase):
psk_agent = PSKAgent("secret123")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testDisconnectByAP/disconnect_by_ap_test.py
View File

@ -17,7 +17,7 @@ class Test(unittest.TestCase):
def test_disconnect(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
hostapd_if = list(hostapd_map.values())[0]

2
autotests/testEAP-AKA-ofono/connection_test.py
View File

@ -21,7 +21,7 @@ class Test(unittest.TestCase):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-AKA-prime-ofono/connection_test.py
View File

@ -21,7 +21,7 @@ class Test(unittest.TestCase):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-AKA-prime/connection_test.py
View File

@ -16,7 +16,7 @@ class Test(unittest.TestCase):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-AKA/connection_test.py
View File

@ -29,7 +29,7 @@ class Test(unittest.TestCase):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-MSCHAPV2/connection_test.py
View File

@ -16,7 +16,7 @@ class Test(unittest.TestCase):
psk_agent = iwd.PSKAgent(*secrets)
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
try:

2
autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py
View File

@ -13,7 +13,7 @@ from iwd import PSKAgent
class Test(unittest.TestCase):
def validate_connection(self, wd):
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testEAP-PEAP-GTC/peap_gtc_test.py
View File

@ -12,7 +12,7 @@ from iwd import NetworkType
class Test(unittest.TestCase):
def validate_connection(self, wd):
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testEAP-PEAP-SIM/connection_test.py
View File

@ -12,7 +12,7 @@ from hlrauc import AuthCenter
class Test(unittest.TestCase):
def validate_connection(self, wd):
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testEAP-PEAP/peap_frag_test.py
View File

@ -14,7 +14,7 @@ class Test(unittest.TestCase):
def validate_connection(self, wd):
ssid_to_connect = 'ssidEAP-PEAP-frag'
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testEAP-PEAP/peap_v0_test.py
View File

@ -14,7 +14,7 @@ class Test(unittest.TestCase):
def validate_connection(self, wd):
ssid_to_connect = 'ssidEAP-PEAPv0'
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testEAP-PEAP/peap_v1_test.py
View File

@ -14,7 +14,7 @@ class Test(unittest.TestCase):
def validate_connection(self, wd):
ssid_to_connect = 'ssidEAP-PEAPv1'
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testEAP-PWD/connection_test.py
View File

@ -30,7 +30,7 @@ class Test(unittest.TestCase):
'secret123'))
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testEAP-PWD/frag_test.py
View File

@ -11,7 +11,7 @@ from iwd import NetworkType
class Test(unittest.TestCase):
def validate_connection(self, wd):
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testEAP-SIM-ofono/connection_test.py
View File

@ -21,7 +21,7 @@ class Test(unittest.TestCase):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-SIM/connection_test.py
View File

@ -27,7 +27,7 @@ class Test(unittest.TestCase):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-TLS-Frag/connection_test.py
View File

@ -13,7 +13,7 @@ class Test(unittest.TestCase):
def test_connection_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-TLS/connection_test.py
View File

@ -26,7 +26,7 @@ class Test(unittest.TestCase):
hostapd_ifname = ifname
break
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-TLSwithMFPC/connection_test.py
View File

@ -13,7 +13,7 @@ class Test(unittest.TestCase):
def test_connection_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-TLSwithMFPR/connection_test.py
View File

@ -13,7 +13,7 @@ class Test(unittest.TestCase):
def test_connection_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-TTLS-CHAP/connection_test.py
View File

@ -31,7 +31,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent('abc', ('user', 'testpasswd'))
wd.register_psk_agent(psk_agent)
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
condition = 'not obj.scanning'
wd.wait_for_object_condition(device, condition)

2
autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py
View File

@ -18,7 +18,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent('abc', ('user', 'testpasswd'))
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-TTLS-Frag/connection_test.py
View File

@ -13,7 +13,7 @@ class Test(unittest.TestCase):
def test_connection_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-TTLS-MSCHAP/connection_test.py
View File

@ -31,7 +31,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent('abc', ('user', 'testpasswd'))
wd.register_psk_agent(psk_agent)
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
condition = 'not obj.scanning'
wd.wait_for_object_condition(device, condition)

2
autotests/testEAP-TTLS-PAP/connection_test.py
View File

@ -31,7 +31,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent('abc', ('user', 'testpasswd'))
wd.register_psk_agent(psk_agent)
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
condition = 'not obj.scanning'
wd.wait_for_object_condition(device, condition)

2
autotests/testEAP-TTLS/connection_test.py
View File

@ -14,7 +14,7 @@ class Test(unittest.TestCase):
def test_connection_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testEAP-WPS-Frag/wps_frag_test.py
View File

@ -16,7 +16,7 @@ class Test(unittest.TestCase):
def test_push_button_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
device.wps_push_button()

6
autotests/testEAP-WPS/wps_test.py
View File

@ -18,7 +18,7 @@ class Test(unittest.TestCase):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
device.wps_push_button()
@ -34,7 +34,7 @@ class Test(unittest.TestCase):
def test_pin_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
pin = device.wps_generate_pin()
self.hostapd.wps_pin(pin)
@ -52,7 +52,7 @@ class Test(unittest.TestCase):
def test_4_digit_pin_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
pin = '1234'
self.hostapd.wps_pin(pin)

4
autotests/testFT-8021x-roam/test.py
View File

@ -26,7 +26,7 @@ class Test(unittest.TestCase):
wd = IWD()
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
# Check that iwd selects BSS 0 first
rule0.signal = -2000
@ -107,7 +107,7 @@ class Test(unittest.TestCase):
wd = IWD()
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
# Check that iwd selects BSS 0 first
rule0.signal = -2000

4
autotests/testFT-PSK-roam/test.py
View File

@ -30,7 +30,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("EasilyGuessedPassword")
wd.register_psk_agent(psk_agent)
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
# Check that iwd selects BSS 0 first
rule0.signal = -2000
@ -116,7 +116,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("EasilyGuessedPassword")
wd.register_psk_agent(psk_agent)
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
# Check that iwd selects BSS 0 first
rule0.signal = -2000

2
autotests/testHiddenNetworks/validation.py
View File

@ -47,7 +47,7 @@ class TestConnectAutoconnect(unittest.TestCase):
psk_agent = PSKAgent(["secret123"], ('domain\\User', 'Password'))
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testKnownNetworks/known_network_test.py
View File

@ -10,7 +10,7 @@ from iwd import IWD
class Test(unittest.TestCase):
def connect_to_new_network(self, wd):
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testMFP-Options/connection_test.py
View File

@ -65,7 +65,7 @@ class TestMFP(unittest.TestCase):
psk_agent = PSKAgent( ['secret123', 'secret123', 'secret123'] )
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testOpen/connection_test.py
View File

@ -14,7 +14,7 @@ class Test(unittest.TestCase):
def test_connection_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testPreauth-roam/test.py
View File

@ -62,7 +62,7 @@ class Test(unittest.TestCase):
wd = IWD()
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
# Check that iwd selects BSS 0 first
rule0.signal = -2500

2
autotests/testRSSIAgent/test.py
View File

@ -23,7 +23,7 @@ class Test(unittest.TestCase):
wd = IWD()
device = wd.list_devices(1)[0];
device = wd.list_devices(1)[0]
# Register agent early to catch any unexpected notifications
agent = TstAgent()

2
autotests/testSAQuery-spoofing/connection_test.py
View File

@ -37,7 +37,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("secret123")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testSAQuery/connection_test.py
View File

@ -30,7 +30,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("secret123")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

4
autotests/testScan/periodic_scan_test.py
View File

@ -21,7 +21,7 @@ class Test(unittest.TestCase):
def set_network(self, ssid):
if ssid not in self.dict:
return;
return
if self.dict[ssid]:
raise Exception('Duplicated list entry')
@ -29,7 +29,7 @@ class Test(unittest.TestCase):
self.dict[ssid] = True
def validate_scan(self, wd):
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

4
autotests/testScan/requested_scan_test.py
View File

@ -23,7 +23,7 @@ class Test(unittest.TestCase):
def set_network(self, ssid):
if ssid not in self.dict:
return;
return
if self.dict[ssid]:
raise Exception('Duplicated list entry')
@ -31,7 +31,7 @@ class Test(unittest.TestCase):
self.dict[ssid] = True
def validate_scan(self, wd):
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testWPA/connection_test.py
View File

@ -18,7 +18,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("secret123")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testWPA2-SHA256/connection_test.py
View File

@ -17,7 +17,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("secret123")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testWPA2/connection_test.py
View File

@ -18,7 +18,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("secret123")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

2
autotests/testWPA2/failure_test.py
View File

@ -18,7 +18,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("InvalidPassword")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
self.assertIsNotNone(devices)
device = devices[0]

2
autotests/testWPA2/password_test.py
View File

@ -15,7 +15,7 @@ class Test(unittest.TestCase):
def test_connection_success(self):
wd = IWD()
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
device.disconnect()

2
autotests/testWPA2withMFP/connection_test.py
View File

@ -17,7 +17,7 @@ class Test(unittest.TestCase):
psk_agent = PSKAgent("secret123")
wd.register_psk_agent(psk_agent)
devices = wd.list_devices(1);
devices = wd.list_devices(1)
device = devices[0]
condition = 'not obj.scanning'

4
autotests/util/hostapd.py
View File

@ -109,7 +109,7 @@ class HostapdCLI:
if wname == self.ifname:
with open(hostapd_map[wname].config, 'r') as f:
# read in config file and search for key
cfg = f.read();
cfg = f.read()
match = re.search(r'%s=.*' % key, cfg)
if match:
return match.group(0).split('=')[1]
@ -131,7 +131,7 @@ class HostapdCLI:
os.system('ifconfig %s up' % intf.name)
os.system('hostapd -g %s -i %s %s &' %
(intf.ctrl_interface, intf.name, intf.config))
break;
break
# set flag so hostapd can be killed after the test
self._hostapd_restarted = True

2
autotests/util/hwsim.py
View File

@ -26,7 +26,7 @@ class HwsimDBusAbstract(iwd.AsyncOpAbstract):
self._object_path = object_path
proxy = self._bus.get_object(HWSIM_SERVICE, self._object_path)
self._iface = dbus.Interface(proxy, self._iface_name)
self._prop_proxy = dbus.Interface(proxy, iwd.DBUS_PROPERTIES);
self._prop_proxy = dbus.Interface(proxy, iwd.DBUS_PROPERTIES)
if properties is None:
self._properties = self._prop_proxy.GetAll(self._iface_name)

4
autotests/util/iwd.py
View File

@ -127,7 +127,7 @@ class IWDDBusAbstract(AsyncOpAbstract):
self._object_path = object_path
proxy = self._bus.get_object(IWD_SERVICE, self._object_path)
self._iface = dbus.Interface(proxy, self._iface_name)
self._prop_proxy = dbus.Interface(proxy, DBUS_PROPERTIES);
self._prop_proxy = dbus.Interface(proxy, DBUS_PROPERTIES)
if properties is None:
self._properties = self._prop_proxy.GetAll(self._iface_name)
@ -930,7 +930,7 @@ class IWD(AsyncOpAbstract):
def create_in_storage(file_name, file_content):
fo = open(IWD_STORAGE_DIR + '/' + file_name, 'w')
fo.write(file_content);
fo.write(file_content)
fo.close()
@staticmethod