Re: [ovs-dev] [PATCH] tests ovsdb-server: Fix config-file same schema test.
On 1/22/24 12:37, Simon Horman wrote:
> On Sat, Jan 20, 2024 at 09:42:52AM +, Frode Nordahl wrote:
>> When a configuration file is used the ovsdb-server (re-)configures
>> databases in multiple passes. First the configuration file is
>> read and a shash is populated, second the shash is iterated over
>> to remove/create databases.
>>
>> The "ovsdb-server config-file - same schema" test currently relies
>> on a certain ordering of this shash, but we can't really rely on a
>> specific ordering as it would be environment specific.
>>
>> The test currently fails on big endian systems such as s390x with:
>> -WARN|failed to open database 'db2': ovsdb error: ordinals: duplicate
>> database name
>> +WARN|failed to open database 'db': ovsdb error: ordinals: duplicate
>> database name
>>
>> Normalize the logged database name so that the test can focus on
>> the fact that duplication is detected rather than in which order.
>>
>> Fixes: 55140090e63a ("ovsdb-server: Allow user-provided config files.")
>> Signed-off-by: Frode Nordahl
>
> Acked-by: Simon Horman
>
Thanks, Frode and Simon!
Ideally we would add a new argument for the sed strings to the macro
and have a particular replacement logic in the test itself. But since
the replacement is actually only needed for one test, seems fine as-is.
Applied. Backported to 3.3 as well.
Best regards, Ilya Maximets.
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH] tests ovsdb-server: Fix config-file same schema test.
On Sat, Jan 20, 2024 at 09:42:52AM +, Frode Nordahl wrote:
> When a configuration file is used the ovsdb-server (re-)configures
> databases in multiple passes. First the configuration file is
> read and a shash is populated, second the shash is iterated over
> to remove/create databases.
>
> The "ovsdb-server config-file - same schema" test currently relies
> on a certain ordering of this shash, but we can't really rely on a
> specific ordering as it would be environment specific.
>
> The test currently fails on big endian systems such as s390x with:
> -WARN|failed to open database 'db2': ovsdb error: ordinals: duplicate
> database name
> +WARN|failed to open database 'db': ovsdb error: ordinals: duplicate database
> name
>
> Normalize the logged database name so that the test can focus on
> the fact that duplication is detected rather than in which order.
>
> Fixes: 55140090e63a ("ovsdb-server: Allow user-provided config files.")
> Signed-off-by: Frode Nordahl
Acked-by: Simon Horman
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
[ovs-dev] [PATCH] tests ovsdb-server: Fix config-file same schema test.
When a configuration file is used the ovsdb-server (re-)configures
databases in multiple passes. First the configuration file is
read and a shash is populated, second the shash is iterated over
to remove/create databases.
The "ovsdb-server config-file - same schema" test currently relies
on a certain ordering of this shash, but we can't really rely on a
specific ordering as it would be environment specific.
The test currently fails on big endian systems such as s390x with:
-WARN|failed to open database 'db2': ovsdb error: ordinals: duplicate database
name
+WARN|failed to open database 'db': ovsdb error: ordinals: duplicate database
name
Normalize the logged database name so that the test can focus on
the fact that duplication is detected rather than in which order.
Fixes: 55140090e63a ("ovsdb-server: Allow user-provided config files.")
Signed-off-by: Frode Nordahl
---
tests/ovsdb-server.at | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index c87ecc2e3..b8ccc4c8e 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -2870,7 +2870,9 @@ m4_define([TEST_CONFIG_FILE],
--config-file=config.json], [$3], [ignore], [stderr])
m4_if([$4], [], [], [
AT_CHECK([cat stderr | grep -v -E 'INFO|DBG' \
-| grep -v 'failed to load configuration from' > warnings])
+| grep -v 'failed to load configuration from' \
+| sed -e "/duplicate database name/ s/'db'/'db2'/" \
+> warnings])
AT_CHECK([cat warnings], [0], [m4_if([$3], [0], [$4], [$4
ovsdb-server: server configuration failed
])])])
--
2.34.1
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
