Re: [ovs-dev] [PATCH] tests: Fix non-portable plus match in python vlog test.
On 6/3/24 13:14, Eelco Chaudron wrote:
>
>
> On 3 Jun 2024, at 13:12, Ilya Maximets wrote:
>
>> '\+' as a one-or-more match is a GNU extension and it doesn't work
>> in BSD sed. This makes the python vlog test to fail on FreeBSD 14
>> that recently got python 3.11 in CirrusCI:
>>
>> | --- - 2024-06-03 10:42:26.363566000 +
>> | +++ /tmp/cirrus-ci-build/tests/testsuite.dir/at-groups/2541/stdout
>> | @@ -7,31 +7,37 @@
>> | Traceback (most recent call last):
>> | File , line , in main
>> | assert fail
>> | +
>>
>> Remove the '\+' match to make the line removal work. It doesn't do
>> much for us as we would remove the same lines either way.
>>
>> This change makes CirruCI green again.
>>
>> Fixes: 9185793e7543 ("tests: Fix compatibility issue with Python 3.13 in
>> vlog.at.")
>> Signed-off-by: Ilya Maximets
>
> The change looks good to me (I did not test it).
>
> Acked-by: Eelco Chaudron
Thanks! I retested this and applied to all branches down to 2.17.
Best regards, Ilya Maximets.
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH] tests: Fix non-portable plus match in python vlog test.
On 3 Jun 2024, at 13:12, Ilya Maximets wrote:
> '\+' as a one-or-more match is a GNU extension and it doesn't work
> in BSD sed. This makes the python vlog test to fail on FreeBSD 14
> that recently got python 3.11 in CirrusCI:
>
> | --- - 2024-06-03 10:42:26.363566000 +
> | +++ /tmp/cirrus-ci-build/tests/testsuite.dir/at-groups/2541/stdout
> | @@ -7,31 +7,37 @@
> | Traceback (most recent call last):
> | File , line , in main
> | assert fail
> | +
>
> Remove the '\+' match to make the line removal work. It doesn't do
> much for us as we would remove the same lines either way.
>
> This change makes CirruCI green again.
>
> Fixes: 9185793e7543 ("tests: Fix compatibility issue with Python 3.13 in
> vlog.at.")
> Signed-off-by: Ilya Maximets
The change looks good to me (I did not test it).
Acked-by: Eelco Chaudron
> ---
> tests/vlog.at | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/vlog.at b/tests/vlog.at
> index efe91479a..2768c0740 100644
> --- a/tests/vlog.at
> +++ b/tests/vlog.at
> @@ -8,7 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \
>
> AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \
> -e 's/File ".*", line [[0-9]][[0-9]]*,/File , line ,/' \
> --e '/\^\+/d' \
> +-e '/\^/d' \
> stderr_log], [0], [dnl
>0 | module_0 | EMER | emergency
>1 | module_0 | ERR | error
> --
> 2.45.0
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
[ovs-dev] [PATCH] tests: Fix non-portable plus match in python vlog test.
'\+' as a one-or-more match is a GNU extension and it doesn't work
in BSD sed. This makes the python vlog test to fail on FreeBSD 14
that recently got python 3.11 in CirrusCI:
| --- - 2024-06-03 10:42:26.363566000 +
| +++ /tmp/cirrus-ci-build/tests/testsuite.dir/at-groups/2541/stdout
| @@ -7,31 +7,37 @@
| Traceback (most recent call last):
| File , line , in main
| assert fail
| +
Remove the '\+' match to make the line removal work. It doesn't do
much for us as we would remove the same lines either way.
This change makes CirruCI green again.
Fixes: 9185793e7543 ("tests: Fix compatibility issue with Python 3.13 in
vlog.at.")
Signed-off-by: Ilya Maximets
---
tests/vlog.at | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/vlog.at b/tests/vlog.at
index efe91479a..2768c0740 100644
--- a/tests/vlog.at
+++ b/tests/vlog.at
@@ -8,7 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \
AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \
-e 's/File ".*", line [[0-9]][[0-9]]*,/File , line ,/' \
--e '/\^\+/d' \
+-e '/\^/d' \
stderr_log], [0], [dnl
0 | module_0 | EMER | emergency
1 | module_0 | ERR | error
--
2.45.0
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
