From patchwork Thu Jan 7 11:26:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1423254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AjvLPoTn; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DBP8h11zHz9sVS for ; Thu, 7 Jan 2021 22:27:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A706E866C9; Thu, 7 Jan 2021 11:27:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id P9PYtVWjJ1oy; Thu, 7 Jan 2021 11:27:11 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0286A86278; Thu, 7 Jan 2021 11:27:11 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9B279C0891; Thu, 7 Jan 2021 11:27:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2C51AC013A for ; Thu, 7 Jan 2021 11:27:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 27D3287364 for ; Thu, 7 Jan 2021 11:27:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z8pbiIGV1qqR for ; Thu, 7 Jan 2021 11:27:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6D6CD87359 for ; Thu, 7 Jan 2021 11:27:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610018828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type; bh=Y/GhJ5+dOmveNkGeu5Sof8xe/jd8miyGfcsqD6icc/M=; b=AjvLPoTnAxkWGh+dxl8w0f8jh3eCfRcTaiGENL/9rrHbPVLJQWFYBq6CkbqxPhizMLxlcP hsbceDx/b70iwM/wzNgdcbkizuXZqY/8wkztzC7O3r5kdQOPmfLymUXnGczzcMIMgN2A0K zC7CubMFkO/aw3fcVf94KrBrTl34OvI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-542-xmimBICsPPCXzI1HH14VXA-1; Thu, 07 Jan 2021 06:27:05 -0500 X-MC-Unique: xmimBICsPPCXzI1HH14VXA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E1E60800D53; Thu, 7 Jan 2021 11:27:04 +0000 (UTC) Received: from dceara.remote.csb (ovpn-113-197.ams2.redhat.com [10.36.113.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC7305D9D7; Thu, 7 Jan 2021 11:27:03 +0000 (UTC) From: Dumitru Ceara To: dev@openvswitch.org Date: Thu, 7 Jan 2021 12:26:59 +0100 Message-Id: <1610018819-3107-1-git-send-email-dceara@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dceara@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: dceara@redhat.com Subject: [ovs-dev] [PATCH ovn] ovn-controller.at: Fix occasionally failing unit 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Test "ovn-controller - Chassis other_config" occasionally fails because it assumes the order of Encaps is always "geneve" first. There is however no guarantee for the iteration order of OVSDB records and in some cases "vxlan" is returned as first Encap generating a slightly different error message. The purpose of the test is to detect the constraint violation so we can relax the grep match. Fixes: fc359bfe9342 ("chassis: Do not try to guess system-id changes.") Signed-off-by: Dumitru Ceara Acked-by: Mark Michelson --- tests/ovn-controller.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index 1b46799..d2a2a8d 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -195,7 +195,7 @@ sysid=${sysid}-foo ovs-vsctl set Open_vSwitch . external-ids:system-id="${sysid}" OVS_WAIT_UNTIL([ - grep -q 'Transaction causes multiple rows in \\"Encap\\" table to have identical values (geneve and \\"192.168.0.1\\") for index on columns \\"type\\" and \\"ip\\".' hv/ovn-controller.log + grep -q 'Transaction causes multiple rows in \\"Encap\\" table to have identical values' hv/ovn-controller.log ]) # Destroy the stale entries manually and ovn-controller should now be able