[PATCH 1/6] auto-t: wpas.py: don't require strict match on wait_for_event

[PATCH 1/6] auto-t: wpas.py: don't require strict match on wait_for_event

[James Prestwood]

[-- Attachment #1: Type: text/plain, Size: 1278 bytes --]

wait_for_event was checking the event string presence in the rx_data
array which meant the event string had to match perfectly to any
received events. This poses problems with events that include additional
information which the caller may not be able to know or does not care
about. For example:

DPP-RX src=02:00:00:00:02:00 freq=2437 type=11

Waiting for this event previously would require the caller know src, freq,
and type. If the caller only wants to wait for DPP-RX, it can now do that.
---
 autotests/util/wpas.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/autotests/util/wpas.py b/autotests/util/wpas.py
index 8fb725f8..5680ec2a 100644
--- a/autotests/util/wpas.py
+++ b/autotests/util/wpas.py
@@ -70,9 +70,10 @@ class Wpas:
         while True:
             context.iteration(may_block=True)
 
-            if event in self._rx_data:
-                GLib.source_remove(timeout)
-                return self._rx_data
+            for e in self._rx_data:
+                if event in e:
+                    GLib.source_remove(timeout)
+                    return self._rx_data
 
             if self._wait_timed_out:
                 raise TimeoutError('waiting for wpas event timed out')
-- 
2.31.1

Re: [PATCH 1/6] auto-t: wpas.py: don't require strict match on wait_for_event

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 728 bytes --]

Hi James,

On 1/4/22 12:18, James Prestwood wrote:
> wait_for_event was checking the event string presence in the rx_data
> array which meant the event string had to match perfectly to any
> received events. This poses problems with events that include additional
> information which the caller may not be able to know or does not care
> about. For example:
> 
> DPP-RX src=02:00:00:00:02:00 freq=2437 type=11
> 
> Waiting for this event previously would require the caller know src, freq,
> and type. If the caller only wants to wait for DPP-RX, it can now do that.
> ---
>   autotests/util/wpas.py | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 

All applied, thanks.

Regards,
-Denis