From patchwork Sat Jan 20 09:42:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1888737 X-Patchwork-Delegate: i.maximets@samsung.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=LJie3IoO; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4THBP55Q2Jz1yPv for ; Sat, 20 Jan 2024 20:43:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 61579846EF; Sat, 20 Jan 2024 09:43:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 61579846EF Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=LJie3IoO X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bUGehcmBpLT4; Sat, 20 Jan 2024 09:43:00 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 8C352846C1; Sat, 20 Jan 2024 09:42:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8C352846C1 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5DDDBC0072; Sat, 20 Jan 2024 09:42:59 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 209C6C0037 for ; Sat, 20 Jan 2024 09:42:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DD46060BD9 for ; Sat, 20 Jan 2024 09:42:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DD46060BD9 Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=LJie3IoO X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9Ac3nJ3WIe2P for ; Sat, 20 Jan 2024 09:42:57 +0000 (UTC) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by smtp3.osuosl.org (Postfix) with ESMTPS id 794F060BD8 for ; Sat, 20 Jan 2024 09:42:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 794F060BD8 Received: from fnordahl.lxd (ti0189a430-2338.bb.online.no [88.90.42.44]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 46E5D3F2CA; Sat, 20 Jan 2024 09:42:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1705743773; bh=y17Gy6qFHw+wjgflRxy+i9TYOUpOMmpxF8YmL0eWHgk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=LJie3IoOnxJ/eRcazu5Rmjmlur7MFhDg6mx6ezh4QFr4M7Jnsv9Poxxw0pLD4rdO/ 71vBx120yTBLpHTRQWxLvVc3wU4naKK98DtEBRcE9mPE4jz5fD/7nX6tArIYPmt27V M998e71A4XdK9usmAACLGwoaEvvQlEuDXkqaby+0BNdw3+2uGMM6clmHDvKP89DDDE TIisjBXvTkZ7Eh+dGyBlOT+RnA9VFexFhflD7kWgN1qqlyQdORmCdaHCUHJil8q/v4 d5cOcAnCGEfGAS/vz4MWUHqSEudnjr2HRqRWAc+nA3dwJYDHN15JfLyzA2cqZpzQS0 P4ODNvAvomDYQ== From: Frode Nordahl To: dev@openvswitch.org Date: Sat, 20 Jan 2024 09:42:52 +0000 Message-Id: <20240120094252.437163-1-frode.nordahl@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Cc: Ilya Maximets Subject: [ovs-dev] [PATCH] tests ovsdb-server: Fix config-file same schema test. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" 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 --- 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 ])])])