mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

tests: Fix non-portable plus match in python vlog test.

Browse Source 
'\+' 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 +0000
 |  +++ /tmp/cirrus-ci-build/tests/testsuite.dir/at-groups/2541/stdout
 |  @@ -7,31 +7,37 @@
 |   Traceback (most recent call last):
 |     File <name>, line <number>, 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 CirrusCI green again.

Fixes: 9185793e75 ("tests: Fix compatibility issue with Python 3.13 in vlog.at.")
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Ilya Maximets
2024-06-03 13:12:04 +02:00
parent f2e4195b0c
commit 6003a88759
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/vlog.at
View File

@@ -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 <name>, line <number>,/' \
-e '/\^\+/d' \
-e '/\^/d' \
stderr_log], [0], [dnl
0 | module_0 | EMER | emergency
1 | module_0 | ERR | error