OpenWrt – Blame information for rev 2
?pathlinks?
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 1 | office | 1 | From 0f5029ff41ef286aa7b3e4a3efd3f1a16be925e8 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be> |
||
| 3 | Date: Wed, 9 Jan 2019 18:41:08 +0100 |
||
| 4 | Subject: [PATCH] tests: refactor test_multi_ap |
||
| 5 | |||
| 6 | With just one additional argument, the run_multi_ap_association function |
||
| 7 | can be used for all tests. |
||
| 8 | |||
| 9 | While we're at it, also move it to the top of the file. |
||
| 10 | |||
| 11 | Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> |
||
| 12 | --- |
||
| 13 | v4: new patch |
||
| 14 | --- |
||
| 15 | tests/hwsim/test_multi_ap.py | 30 +++++++++++------------------- |
||
| 16 | 1 file changed, 11 insertions(+), 19 deletions(-) |
||
| 17 | |||
| 18 | --- a/tests/hwsim/test_multi_ap.py |
||
| 19 | +++ b/tests/hwsim/test_multi_ap.py |
||
| 20 | @@ -6,6 +6,15 @@ |
||
| 21 | |||
| 22 | import hostapd |
||
| 23 | |||
| 24 | +def run_multi_ap_association(dev, apdev, multi_ap, wait_connect=True): |
||
| 25 | + params = hostapd.wpa2_params(ssid="multi-ap", passphrase="12345678") |
||
| 26 | + if multi_ap: |
||
| 27 | + params["multi_ap"] = str(multi_ap) |
||
| 28 | + hapd = hostapd.add_ap(apdev[0], params) |
||
| 29 | + |
||
| 30 | + dev[0].connect("multi-ap", psk="12345678", scan_freq="2412", |
||
| 31 | + multi_ap_backhaul_sta="1", wait_connect=wait_connect) |
||
| 32 | + |
||
| 33 | def test_multi_ap_association(dev, apdev): |
||
| 34 | """Multi-AP association in backhaul BSS""" |
||
| 35 | run_multi_ap_association(dev, apdev, 1) |
||
| 36 | @@ -28,21 +37,9 @@ def test_multi_ap_association_shared_bss |
||
| 37 | run_multi_ap_association(dev, apdev, 3) |
||
| 38 | dev[1].connect("multi-ap", psk="12345678", scan_freq="2412") |
||
| 39 | |||
| 40 | -def run_multi_ap_association(dev, apdev, multi_ap): |
||
| 41 | - params = hostapd.wpa2_params(ssid="multi-ap", passphrase="12345678") |
||
| 42 | - params["multi_ap"] = str(multi_ap) |
||
| 43 | - hapd = hostapd.add_ap(apdev[0], params) |
||
| 44 | - |
||
| 45 | - dev[0].connect("multi-ap", psk="12345678", multi_ap_backhaul_sta="1", |
||
| 46 | - scan_freq="2412") |
||
| 47 | - |
||
| 48 | def test_multi_ap_disabled_on_ap(dev, apdev): |
||
| 49 | """Multi-AP association attempt when disabled on AP""" |
||
| 50 | - params = hostapd.wpa2_params(ssid="multi-ap", passphrase="12345678") |
||
| 51 | - hapd = hostapd.add_ap(apdev[0], params) |
||
| 52 | - |
||
| 53 | - dev[0].connect("multi-ap", psk="12345678", multi_ap_backhaul_sta="1", |
||
| 54 | - scan_freq="2412", wait_connect=False) |
||
| 55 | + run_multi_ap_association(dev, apdev, 0, wait_connect=False) |
||
| 56 | ev = dev[0].wait_event([ "CTRL-EVENT-DISCONNECTED", |
||
| 57 | "CTRL-EVENT-CONNECTED" ], |
||
| 58 | timeout=5) |
||
| 59 | @@ -54,12 +51,7 @@ def test_multi_ap_disabled_on_ap(dev, ap |
||
| 60 | |||
| 61 | def test_multi_ap_fronthaul_on_ap(dev, apdev): |
||
| 62 | """Multi-AP association attempt when only fronthaul BSS on AP""" |
||
| 63 | - params = hostapd.wpa2_params(ssid="multi-ap", passphrase="12345678") |
||
| 64 | - params["multi_ap"] = "2" |
||
| 65 | - hapd = hostapd.add_ap(apdev[0], params) |
||
| 66 | - |
||
| 67 | - dev[0].connect("multi-ap", psk="12345678", multi_ap_backhaul_sta="1", |
||
| 68 | - scan_freq="2412", wait_connect=False) |
||
| 69 | + run_multi_ap_association(dev, apdev, 2, wait_connect=False) |
||
| 70 | ev = dev[0].wait_event([ "CTRL-EVENT-DISCONNECTED", |
||
| 71 | "CTRL-EVENT-CONNECTED", |
||
| 72 | "CTRL-EVENT-ASSOC-REJECT" ], |