diff mbox series

[ovs-dev,01/11] tests: Fix ovn-macro when ovn_check_packets__ fails.

Message ID 20250710153345.104954-2-xsimonar@redhat.com
State Superseded
Headers show
Series Multiple unit/system tests fixes. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Xavier Simonart July 10, 2025, 3:33 p.m. UTC
When ovn_check_packets__ was failing because not enough packets were
received, dump_diff was not printing any packet diff but something
like "sort: cannot read: hv1/vif-tx.packets: No such file or directory".
This did not cause any tests failure as such, but made it difficult to
debug existing tests failures.

sort: cannot read: hv1/vif11-tx.packets: No such file or directory

Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
---
 tests/ovn-macros.at | 2 ++
 1 file changed, 2 insertions(+)

Comments

Mark Michelson July 21, 2025, 8:49 p.m. UTC | #1
Acked-by: Mark Michelson <mmichels@redhat.com>

On 7/10/25 11:33 AM, Xavier Simonart via dev wrote:
> When ovn_check_packets__ was failing because not enough packets were
> received, dump_diff was not printing any packet diff but something
> like "sort: cannot read: hv1/vif-tx.packets: No such file or directory".
> This did not cause any tests failure as such, but made it difficult to
> debug existing tests failures.
> 
> sort: cannot read: hv1/vif11-tx.packets: No such file or directory
> 
> Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
> ---
>   tests/ovn-macros.at | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
> index d0f1c0bf4..13cff5c38 100644
> --- a/tests/ovn-macros.at
> +++ b/tests/ovn-macros.at
> @@ -33,6 +33,7 @@ m4_divert_text([PREPARE_TESTS],
>          [$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" $rcv_pcap > rcv_tmp
>           rcv_n=`wc -l < rcv_tmp`
>           echo "rcv_n=$rcv_n exp_n=$exp_n"
> +        cat rcv_tmp > $rcv_text
>           test $rcv_n -ge $exp_n],
>          [dump_diff__ "$rcv_pcap" "$exp_text"])
>        sort $exp_text | $cmd > expout
> @@ -50,6 +51,7 @@ m4_divert_text([PREPARE_TESTS],
>           sed -i '/ffffffffffff/d' rcv_tmp
>           rcv_n=`wc -l < rcv_tmp`
>           echo "rcv_n=$rcv_n exp_n=$exp_n"
> +        cat rcv_tmp > $rcv_text
>           test $rcv_n -ge $exp_n],
>          [dump_diff__ "$rcv_pcap" "$exp_text"])
>        sort $exp_text | $cmd > expout
diff mbox series

Patch

diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index d0f1c0bf4..13cff5c38 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -33,6 +33,7 @@  m4_divert_text([PREPARE_TESTS],
        [$PYTHON "$ovs_srcdir/utilities/ovs-pcap.in" $rcv_pcap > rcv_tmp
         rcv_n=`wc -l < rcv_tmp`
         echo "rcv_n=$rcv_n exp_n=$exp_n"
+        cat rcv_tmp > $rcv_text
         test $rcv_n -ge $exp_n],
        [dump_diff__ "$rcv_pcap" "$exp_text"])
      sort $exp_text | $cmd > expout
@@ -50,6 +51,7 @@  m4_divert_text([PREPARE_TESTS],
         sed -i '/ffffffffffff/d' rcv_tmp
         rcv_n=`wc -l < rcv_tmp`
         echo "rcv_n=$rcv_n exp_n=$exp_n"
+        cat rcv_tmp > $rcv_text
         test $rcv_n -ge $exp_n],
        [dump_diff__ "$rcv_pcap" "$exp_text"])
      sort $exp_text | $cmd > expout