From patchwork Tue Sep 24 07:02:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roi Dayan X-Patchwork-Id: 1988790 X-Patchwork-Delegate: echaudro@redhat.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=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=DFGiV/zt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4XCW5p0LSmz1xsM for ; Tue, 24 Sep 2024 17:02:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BABFA4032C; Tue, 24 Sep 2024 07:02:50 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id VlrsQjyZTJdF; Tue, 24 Sep 2024 07:02:48 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F03104024F Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=DFGiV/zt Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id F03104024F; Tue, 24 Sep 2024 07:02:47 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9F6DFC0015; Tue, 24 Sep 2024 07:02:47 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id D1EF5C0011 for ; Tue, 24 Sep 2024 07:02:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A60E360A69 for ; Tue, 24 Sep 2024 07:02:46 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id z-0QmatRSr6H for ; Tue, 24 Sep 2024 07:02:45 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a01:111:f403:2009::601; helo=nam10-bn7-obe.outbound.protection.outlook.com; envelope-from=roid@nvidia.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org BBCAC60A62 Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BBCAC60A62 Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=DFGiV/zt Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20601.outbound.protection.outlook.com [IPv6:2a01:111:f403:2009::601]) by smtp3.osuosl.org (Postfix) with ESMTPS id BBCAC60A62 for ; Tue, 24 Sep 2024 07:02:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gsoSobGQzPUbdAVG6gyEs1HR19QG7BwJikLOvv8Byjw+KUnDCBi9qupfYvppjVWVeaaSqasahiB3G34nDHr1XI2SirjkFmJPmyF63yxm3xb1DA9HAN+X3W6mroxnJ1qMN3xW3RGxXvb92XA0cpg09keX/Q3I2/oVt2pqiBW1knM07exBInWVcbD4SLt1NOYuLSUBFccNZqoI96QVwrN8fR77cvtTy9ZZsIJW6KHn93ga77AxoeZqQfjakDl7y2yEWlx2NP1PQV7Qadz6ACQAWC495h69lYKlhVWqMlkOhVyv1LtcnSslX3VTYoPeivIZ6e1NQSeTGNvAOwaycJTUAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OqEhCJ11AJ+vk2FhvY0k6Lhc5Zza1g7BwSSbUBpcr4Q=; b=q1GwlPVqrHDcfRgsLyPfQ13MPwQ18gErlIlAwarSZkWq9EN2REFCtq2zh2M39Od48vT2O2HORCxEG84NjNxDJ6mzUBRl4kACi1XcdR69xAC+rqKC3pKmmC3BDdhfArDM4WVmTjEA2JvPqqLh8uKmL/vJhiPLQ+Lsih2dXS0iALwKBGFV7rENqBEpAqKW2ACtn9JJBq5wIXRD5nm86jUO1nLP44VIfRxo74BLi2LrYJB00UvqdDYJstDhnet6DnnqQFSKgXRUcLV1KL2eJtb+pdpdh2WmJSeGuPaYOsOVNciDi8XLhvGarwYS4P5pIMilEd3kj9AXguLm+G8ZZsl6Qw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=openvswitch.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OqEhCJ11AJ+vk2FhvY0k6Lhc5Zza1g7BwSSbUBpcr4Q=; b=DFGiV/zttxGcO/xWmpv42n6GHUIIS9u4BYUz4LsM4cFSxVh2VMSLeIybszKtpMM36GeUi1OD6qXzXROt/1aKZjBtcJ7OcCMaOLmey9h1wQof2302K1FDiMhU3xQfbbv3iXyhc+vh0pkER6SIOOY6/2oqJ/ZMDeal+eRIFwj7PzdShzZF8xM7ZlkTty/2Z2B+RTxl2MinoOF/xTyY1UYe04Z9i6IvL1LCn1hSv6LiX/Ym2iAyGYFIc8oaVHS9MbWD7H+LsN7CGGy2eAN+PTZTbFsfeCbU9IL/G40Q9FHK6sY0mdtJtBKkRh1vOO3p12D487VFTHfCodogpdiiFahYZQ== Received: from SA1PR02CA0023.namprd02.prod.outlook.com (2603:10b6:806:2cf::25) by BL3PR12MB9049.namprd12.prod.outlook.com (2603:10b6:208:3b8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.27; Tue, 24 Sep 2024 07:02:38 +0000 Received: from SN1PEPF0002BA52.namprd03.prod.outlook.com (2603:10b6:806:2cf:cafe::c) by SA1PR02CA0023.outlook.office365.com (2603:10b6:806:2cf::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.27 via Frontend Transport; Tue, 24 Sep 2024 07:02:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SN1PEPF0002BA52.mail.protection.outlook.com (10.167.242.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.15 via Frontend Transport; Tue, 24 Sep 2024 07:02:36 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 24 Sep 2024 00:02:24 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 24 Sep 2024 00:02:23 -0700 Received: from c-237-147-80-085.mtl.labs.mlnx (10.127.8.14) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Tue, 24 Sep 2024 00:02:22 -0700 To: Date: Tue, 24 Sep 2024 10:02:14 +0300 Message-ID: <20240924070214.1300142-2-roid@nvidia.com> X-Mailer: git-send-email 2.18.2 In-Reply-To: <20240924070214.1300142-1-roid@nvidia.com> References: <20240924070214.1300142-1-roid@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA52:EE_|BL3PR12MB9049:EE_ X-MS-Office365-Filtering-Correlation-Id: 93af6073-0b43-4e2a-199c-08dcdc66df14 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: 7Ur40BTugsOITOwBBsbklv2s0Oy2bRjM8510rKn0k9+jJr8MgGT2PZDnSixUQ92g/4Z8kSs/gCWMtz5e7a0zpM2lfj74VAK7U31V8ZtTfplVWUuxwHQX04+9UjnViIaA8kGMtFIEN+MvP65H7UDb4T41E8ESo07eAJjmRqEdY7s3ifYsYmm399N18JfqnlmN4iD7e5oiHKwFkyFLpeJFg1qHZABML+30XlGxwuyu3Ie8BLMcyqJecMnPTQIKb/ZAIBKBuXaqMQWb5kpb0Q2+dQqezQ+96lqS9/eOShWwwQ5RkwcovMc+PWr37oZVqPal4rOIhgzzd1XygTarxeS6lOEF2p+yp8D9xEpR1JeT1jx2u6laNu65XUunrSloJvO27SSJ3Mvy8+2n1fLW7YF+x/JUsQlW0ClV/CRPZ34vqSmlcj+PVigWOYziXzaXuMGjxYZRzOS0tH3EOiTzJAP3Jp2RQoml17AwIRxlG/zWQAy+0VsGSr9WmxBxYpLxnpzKJACdoWLwswjQPtW9W2uY0pd3aShQ8MS0tb8jlbLew5cs2Bn952Dz4uNdhiNYE7FuKN5s8wpy6yC/vMxZlziIGIjx8uf/sTgxHnj8YkQx8XMNQH2eOHcv586iyuSgLMjRW52CAIinKpGG7iN0X4p+2aCqJFnr9b7wOArcuZRmCnT/7bRo/Q80MrTDV9pTHZ8xY0bKAQbN/wouRmwQ878m9q//NIFFQR/XBAKisicgIHYp6FuIZONGTc6pBTyZ+GhqWhV5iDNIyeEnJA3814RlJlgEy98sbEtVMrV7+fQv/78Zheb3+77Qt9yhi9LaK4A1yt19DgMXbXk7bLPLAgv3eTYTb0hCgRnfrxSpYkUZXtkjV8nJZTC5W95gHb7dQXI1puxmQ6t21Dxtpe+ZDWqR01tJ7VoGj0aYRnxP36OQcXWNFaA1Mpv+MpQ2dX34emjuulX7exFU2RpjvhvDMaXGyyCKVL7/uQDIzUK5WMFzHRR5L27x95dkijy3Mw5hqkodOe3xarRKwCaTE43XEXste92vPWlVOOLTw97C6QpWAKy3+9pVGVX3XyhOv+SIwjPye9uMjKNH+xfT0cW0v5k0EeEzBtIQzruCYaWfxxh0QcLM9pSmbVCWIo99opFPqAP1KXLVJRMP/Sg/qElXIrm38/OLIL5Q1lak+AbYMrR1LUpAlUbLtcsIIaOlbM4hkXjZHyxqSe5OJgKWiFW4BoUaahLkwGNU1E2g0XKjQgbeAtJRL3I2kVd7gkZ58MfW8jXedTGtp3sfcm74PWGqyWDcQxjzfu/Nt6EejGWRQ7WDwsFKi+Jx0EgvS5LjwfBcD9crfeIKeFDoJb0TZoPWV5YCyQ49UZDT324yXXqk5mBXmETMu0IU15PiIIgm/+Nt6rL+ X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2024 07:02:36.5772 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93af6073-0b43-4e2a-199c-08dcdc66df14 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002BA52.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB9049 Subject: [ovs-dev] [PATCH 2/2] tests: ovsdb: Add ovsdb prefix to related tests. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Roi Dayan via dev From: Roi Dayan Reply-To: Roi Dayan Cc: Maor Dickman Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Add ovsdb-idl prefix for tests in ovsdb-idl.at. Add ovsdb-log prefix for tests in ovsdb-log.at. Add ovsdb prefix for the rest of the ovsdb tests. Signed-off-by: Roi Dayan Acked-by: Eelco Chaudron Acked-by: Simon Horman --- tests/ovsdb-execution.at | 4 +-- tests/ovsdb-idl.at | 62 ++++++++++++++++++++-------------------- tests/ovsdb-log.at | 28 +++++++++--------- tests/ovsdb-macros.at | 8 +++--- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/tests/ovsdb-execution.at b/tests/ovsdb-execution.at index 1ffa2b738541..868abca13e44 100644 --- a/tests/ovsdb-execution.at +++ b/tests/ovsdb-execution.at @@ -137,7 +137,7 @@ m4_divert_pop([PREPARE_TESTS]) # # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_EXECUTION_RO], - [AT_SETUP([$1]) + [AT_SETUP([ovsdb - $1]) AT_KEYWORDS([ovsdb execute execution positive $5]) AT_CHECK([test-ovsdb execute-readonly "`$2`" m4_foreach([txn], [$3], [ 'txn'])], [0], [stdout], []) @@ -175,7 +175,7 @@ OVSDB_CHECK_EXECUTION_RO([allow select on read only DB], # # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_EXECUTION], - [AT_SETUP([$1]) + [AT_SETUP([ovsdb - $1]) AT_KEYWORDS([ovsdb execute execution positive $5]) AT_CHECK([test-ovsdb execute "`$2`" m4_foreach([txn], [$3], [ 'txn'])], [0], [stdout], []) diff --git a/tests/ovsdb-idl.at b/tests/ovsdb-idl.at index b8952c869f41..72e5bff16196 100644 --- a/tests/ovsdb-idl.at +++ b/tests/ovsdb-idl.at @@ -87,7 +87,7 @@ m4_define([OVSDB_CLUSTER_START_IDLTEST], # # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_IDL_C], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -101,7 +101,7 @@ m4_define([OVSDB_CHECK_IDL_C], # same as OVSDB_CHECK_IDL but uses OVSDB_IDL_WRITE_CHANGED_ONLY. m4_define([OVSDB_CHECK_IDL_WRITE_CHANGED_ONLY_C], - [AT_SETUP([$1 - write-changed-only - C]) + [AT_SETUP([ovsdb-idl - $1 - write-changed-only - C]) AT_KEYWORDS([ovsdb server idl positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -115,7 +115,7 @@ m4_define([OVSDB_CHECK_IDL_WRITE_CHANGED_ONLY_C], # same as OVSDB_CHECK_IDL but uses tcp. m4_define([OVSDB_CHECK_IDL_TCP_C], - [AT_SETUP([$1 - C - tcp]) + [AT_SETUP([ovsdb-idl - $1 - C - tcp]) AT_KEYWORDS([ovsdb server idl positive tcp socket $5]) OVSDB_START_IDLTEST(["ptcp:0:127.0.0.1"]) PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT]) @@ -131,7 +131,7 @@ m4_define([OVSDB_CHECK_IDL_TCP_C], # same as OVSDB_CHECK_IDL but uses tcp6. m4_define([OVSDB_CHECK_IDL_TCP6_C], - [AT_SETUP([$1 - C - tcp6]) + [AT_SETUP([ovsdb-idl - $1 - C - tcp6]) AT_SKIP_IF([test "$IS_WIN32" = "yes"]) AT_SKIP_IF([test $HAVE_IPV6 = no]) AT_KEYWORDS([ovsdb server idl positive tcp6 socket $5]) @@ -149,7 +149,7 @@ m4_define([OVSDB_CHECK_IDL_TCP6_C], # same as OVSDB_CHECK_IDL but uses the Python IDL implementation. m4_define([OVSDB_CHECK_IDL_PY], - [AT_SETUP([$1 - Python3]) + [AT_SETUP([ovsdb-idl - $1 - Python3]) AT_KEYWORDS([ovsdb server idl positive Python $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -162,7 +162,7 @@ m4_define([OVSDB_CHECK_IDL_PY], AT_CLEANUP]) m4_define([OVSDB_CHECK_IDL_REGISTER_COLUMNS_PY], - [AT_SETUP([$1 - Python3 - register_columns]) + [AT_SETUP([ovsdb-idl - $1 - Python3 - register_columns]) AT_KEYWORDS([ovsdb server idl positive Python register_columns $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -185,7 +185,7 @@ m4_define([OVSDB_CHECK_IDL_REGISTER_COLUMNS_PY], # same as OVSDB_CHECK_IDL but uses the Python IDL implementation with tcp m4_define([OVSDB_CHECK_IDL_TCP_PY], - [AT_SETUP([$1 - Python3 - tcp]) + [AT_SETUP([ovsdb-idl - $1 - Python3 - tcp]) AT_KEYWORDS([ovsdb server idl positive Python with tcp socket $5]) OVSDB_START_IDLTEST(["ptcp:0:127.0.0.1"]) PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT]) @@ -202,7 +202,7 @@ m4_define([OVSDB_CHECK_IDL_TCP_PY], # same as OVSDB_CHECK_IDL but uses the Python IDL implementation with tcp # with multiple remotes with only one remote reachable m4_define([OVSDB_CHECK_IDL_TCP_MULTIPLE_REMOTES_PY], - [AT_SETUP([$1 - Python3 (multiple remotes) - tcp]) + [AT_SETUP([ovsdb-idl - $1 - Python3 (multiple remotes) - tcp]) AT_KEYWORDS([ovsdb server idl positive Python with tcp socket $5]) OVSDB_START_IDLTEST(["ptcp:0:127.0.0.1"]) PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT]) @@ -220,7 +220,7 @@ m4_define([OVSDB_CHECK_IDL_TCP_MULTIPLE_REMOTES_PY], # same as OVSDB_CHECK_IDL but uses the Python IDL implementation with tcp6 m4_define([OVSDB_CHECK_IDL_TCP6_PY], - [AT_SETUP([$1 - Python3 - tcp6]) + [AT_SETUP([ovsdb-idl $1 - Python3 - tcp6]) AT_SKIP_IF([test "$IS_WIN32" = "yes"]) AT_SKIP_IF([test $HAVE_IPV6 = no]) AT_KEYWORDS([ovsdb server idl positive Python with tcp6 socket $5]) @@ -238,7 +238,7 @@ m4_define([OVSDB_CHECK_IDL_TCP6_PY], AT_CLEANUP]) m4_define([OVSDB_CHECK_IDL_TCP6_MULTIPLE_REMOTES_PY], - [AT_SETUP([$1 - Python3 - tcp6]) + [AT_SETUP([ovsdb-idl - $1 - Python3 - tcp6]) AT_SKIP_IF([test "$IS_WIN32" = "yes"]) AT_SKIP_IF([test $HAVE_IPV6 = no]) AT_KEYWORDS([ovsdb server idl positive Python with tcp6 socket $5]) @@ -258,7 +258,7 @@ m4_define([OVSDB_CHECK_IDL_TCP6_MULTIPLE_REMOTES_PY], # same as OVSDB_CHECK_IDL but uses the Python IDL implementation with SSL m4_define([OVSDB_CHECK_IDL_SSL_PY], - [AT_SETUP([$1 - Python3 - SSL]) + [AT_SETUP([ovsdb-idl - $1 - Python3 - SSL]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) $PYTHON3 -c "import ssl" SSL_PRESENT=$? @@ -308,7 +308,7 @@ m4_define([OVSDB_CHECK_IDL], # This test uses the Python IDL implementation with passive tcp m4_define([OVSDB_CHECK_IDL_PASSIVE_TCP_PY], - [AT_SETUP([$1 - Python3 - ptcp]) + [AT_SETUP([ovsdb-idl - $1 - Python3 - ptcp]) AT_KEYWORDS([ovsdb server idl positive Python with tcp socket $5]) # find free TCP port OVSDB_START_IDLTEST(["ptcp:0:127.0.0.1"]) @@ -495,7 +495,7 @@ OVSDB_CHECK_IDL([simple idl, writing via IDL with unicode], ]]) m4_define([OVSDB_CHECK_IDL_PY_WITH_EXPOUT], - [AT_SETUP([$1 - Python3]) + [AT_SETUP([ovsdb-idl - $1 - Python3]) AT_KEYWORDS([ovsdb server idl positive Python $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -1032,7 +1032,7 @@ OVSDB_CHECK_IDL_PY([row-from-json idl, whats this], 003: done ]]) -AT_SETUP([idl handling of missing tables and columns - C]) +AT_SETUP([ovsdb-idl - handling of missing tables and columns - C]) AT_KEYWORDS([ovsdb server idl positive]) # idltest2.ovsschema is the same as idltest.ovsschema, except that @@ -1110,7 +1110,7 @@ OVSDB_SERVER_SHUTDOWN AT_CLEANUP m4_define([OVSDB_CHECK_IDL_FETCH_COLUMNS_PY], - [AT_SETUP([$1 - Python3 - fetch]) + [AT_SETUP([ovsdb-idl - $1 - Python3 - fetch]) AT_KEYWORDS([ovsdb server idl positive Python increment fetch $6]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -1154,7 +1154,7 @@ OVSDB_CHECK_IDL_FETCH_COLUMNS([simple idl, initially populated], ]]) m4_define([OVSDB_CHECK_IDL_WO_MONITOR_COND_C], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl monitor $4]) OVSDB_START_IDLTEST AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/disable-monitor-cond]) @@ -1167,7 +1167,7 @@ m4_define([OVSDB_CHECK_IDL_WO_MONITOR_COND_C], AT_CLEANUP]) m4_define([OVSDB_CHECK_IDL_WO_MONITOR_COND_PY], - [AT_SETUP([$1 - Python3]) + [AT_SETUP([ovsdb-idl - $1 - Python3]) AT_KEYWORDS([ovsdb server idl Python monitor $4]) OVSDB_START_IDLTEST AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/disable-monitor-cond]) @@ -1261,7 +1261,7 @@ OVSDB_CHECK_IDL_WO_MONITOR_COND([simple idl disable monitor-cond], ]]) m4_define([OVSDB_CHECK_IDL_TRACK_C], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl tracking positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -1274,7 +1274,7 @@ m4_define([OVSDB_CHECK_IDL_TRACK_C], AT_CLEANUP]) m4_define([OVSDB_CHECK_IDL_TRACK_WRITE_CHANGED_ONLY_C], - [AT_SETUP([$1 - write-changed-only - C]) + [AT_SETUP([ovsdb-idl - $1 - write-changed-only - C]) AT_KEYWORDS([ovsdb server idl tracking positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -1854,7 +1854,7 @@ OVSDB_CHECK_IDL_TRACK([track, simple idl, initially empty, various ops], ]]) m4_define([OVSDB_CHECK_IDL_PARTIAL_UPDATE_MAP_COLUMN], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl partial update map column positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -1918,7 +1918,7 @@ OVSDB_CHECK_IDL_PY([partial-map update set refmap idl], ]]) m4_define([OVSDB_CHECK_IDL_PARTIAL_UPDATE_SET_COLUMN], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl partial update set column positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -2139,7 +2139,7 @@ OVSDB_CHECK_IDL_NOTIFY([indexed idl, modification and removal notify], # Then, some at_checks are used to verify the correctness of the corresponding index as well as the existence # of all the rows involved in the test. m4_define([OVSDB_CHECK_IDL_COMPOUND_INDEX_SINGLE_COLUMN_C], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl compound_index_single_column compound_index positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -2286,7 +2286,7 @@ OVSDB_CHECK_IDL_COMPOUND_INDEX_SINGLE_COLUMN_C([Compound_index, single column te # Then, some at_checks are used to verify the correctness of the corresponding index as well as the existence # of all the rows involved in the test. m4_define([OVSDB_CHECK_IDL_COMPOUND_INDEX_DOUBLE_COLUMN_C], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl compound_index_double_column compound_index positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -2425,7 +2425,7 @@ OVSDB_CHECK_IDL_COMPOUND_INDEX_DOUBLE_COLUMN_C([Compound_index, double column te ]) m4_define([OVSDB_CHECK_IDL_COMPOUND_INDEX_WITH_REF], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl compound_index compound_index_with_ref positive $5]) OVSDB_START_IDLTEST m4_if([$2], [], [], @@ -2451,7 +2451,7 @@ OVSDB_CHECK_IDL_COMPOUND_INDEX_WITH_REF([set, simple3 idl-compound-index-with-re ]]) m4_define([CHECK_STREAM_OPEN_BLOCK], - [AT_SETUP([Check stream open block - $1 - $3]) + [AT_SETUP([ovsdb-idl - Check stream open block - $1 - $3]) AT_SKIP_IF([test "$3" = "tcp6" && test "$IS_WIN32" = "yes"]) AT_SKIP_IF([test "$3" = "tcp6" && test "$HAVE_IPV6" = "no"]) AT_SKIP_IF([test "$3" = "ssl6" && test "$IS_WIN32" = "yes"]) @@ -2512,7 +2512,7 @@ m4_define([OVSDB_CLUSTER_CHECK_MONITOR_COND_SINCE_TXN_IDS], # same as OVSDB_CHECK_IDL but uses Python IDL implementation with tcp # with multiple remotes to assert the idl connects to the leader of the Raft cluster m4_define([OVSDB_CHECK_IDL_LEADER_ONLY_PY], - [AT_SETUP([$1 - Python3 (leader only)]) + [AT_SETUP([ovsdb-idl - $1 - Python3 (leader only)]) AT_SKIP_IF([test "$IS_ARM64" = "yes"]) AT_KEYWORDS([ovsdb server idl Python leader_only with tcp socket]) m4_define([LPBK],[127.0.0.1]) @@ -2555,7 +2555,7 @@ OVSDB_CHECK_IDL_LEADER_ONLY_PY([Check Python IDL reconnects to leader], 3, ['rem # If LOG_FILTER is provided, checks that the contents of LOG_FILTER # are not matched by grep in the test-ovsdb logs. m4_define([OVSDB_CHECK_CLUSTER_IDL_C], - [AT_SETUP([$1 - C - tcp]) + [AT_SETUP([ovsdb-idl - $1 - C - tcp]) AT_KEYWORDS([ovsdb server idl tcp $6]) m4_define([LPBK],[127.0.0.1]) OVSDB_CLUSTER_START_IDLTEST([$2], ["ptcp:0:"LPBK]) @@ -2576,7 +2576,7 @@ m4_define([OVSDB_CHECK_CLUSTER_IDL_C], # Same as OVSDB_CHECK_CLUSTER_IDL_C but uses the Python IDL implementation. m4_define([OVSDB_CHECK_CLUSTER_IDL_PY], - [AT_SETUP([$1 - Python3 - tcp]) + [AT_SETUP([ovsdb-idl - $1 - Python3 - tcp]) AT_KEYWORDS([ovsdb server idl tcp $6]) m4_define([LPBK],[127.0.0.1]) OVSDB_CLUSTER_START_IDLTEST([$2], ["ptcp:0:"LPBK]) @@ -2810,7 +2810,7 @@ OVSDB_CHECK_IDL_TRACK([track, insert and delete, refs to link2], ]]) m4_define([OVSDB_CHECK_IDL_PERS_UUID_INSERT_C], - [AT_SETUP([$1 - C]) + [AT_SETUP([ovsdb-idl - $1 - C]) AT_KEYWORDS([ovsdb server idl persistent uuid insert]) OVSDB_START_IDLTEST([], ["$abs_srcdir/idltest.ovsschema"]) AT_CHECK([test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket $2], @@ -2822,7 +2822,7 @@ m4_define([OVSDB_CHECK_IDL_PERS_UUID_INSERT_C], AT_CLEANUP]) m4_define([OVSDB_CHECK_IDL_PERS_UUID_INSERT_PY], - [AT_SETUP([$1 - Python3]) + [AT_SETUP([ovsdb-idl - $1 - Python3]) AT_KEYWORDS([ovsdb server idl python persistent uuid insert]) OVSDB_START_IDLTEST([], ["$abs_srcdir/idltest.ovsschema"]) AT_CHECK([$PYTHON3 $srcdir/test-ovsdb.py -t10 idl $srcdir/idltest.ovsschema unix:socket $2], @@ -2896,7 +2896,7 @@ OVSDB_CHECK_IDL_PY([simple idl, python, add_op], m4_define([OVSDB_CHECK_IDL_CHANGE_AWARE], - [AT_SETUP([simple idl, database change aware, online conversion - $1]) + [AT_SETUP([ovsdb-idl - simple idl, database change aware, online conversion - $1]) AT_KEYWORDS([ovsdb server idl db_change_aware conversion $1]) m4_if([$1], [clustered], diff --git a/tests/ovsdb-log.at b/tests/ovsdb-log.at index 00a244ba4adb..835ea728bdab 100644 --- a/tests/ovsdb-log.at +++ b/tests/ovsdb-log.at @@ -1,6 +1,6 @@ AT_BANNER([OVSDB -- logging]) -AT_SETUP([create empty, reread]) +AT_SETUP([ovsdb-log - create empty, reread]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([log]) AT_CHECK( @@ -15,7 +15,7 @@ file: read: end of log AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write one, reread]) +AT_SETUP([ovsdb-log - write one, reread]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -32,7 +32,7 @@ file: read: end of log AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([check that create fails if file exists]) +AT_SETUP([ovsdb-log - check that create fails if file exists]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -57,7 +57,7 @@ file: read: {"x":1} AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write one, reread]) +AT_SETUP([ovsdb-log - write one, reread]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -78,7 +78,7 @@ file: read: end of log AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write one, replace, commit]) +AT_SETUP([ovsdb-log - write one, replace, commit]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) for option in '' --no-rename-open-files; do @@ -115,7 +115,7 @@ done AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write one, replace, abort]) +AT_SETUP([ovsdb-log - write one, replace, abort]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) for option in '' --no-rename-open-files; do @@ -152,7 +152,7 @@ done AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write one, reread - alternative magic]) +AT_SETUP([ovsdb-log - write one, reread - alternative magic]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) # Sometimes you just need more magic: @@ -179,7 +179,7 @@ AT_CHECK( AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write one, reread, append]) +AT_SETUP([ovsdb-log - write one, reread, append]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -209,7 +209,7 @@ file: read: end of log AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write, reread one, overwrite]) +AT_SETUP([ovsdb-log - write, reread one, overwrite]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -235,7 +235,7 @@ file: read: end of log AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write, add corrupted data, read]) +AT_SETUP([ovsdb-log - write, add corrupted data, read]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -257,7 +257,7 @@ file: read failed: syntax error: file: parse error at offset 186 in header line AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write, add corrupted data, read, overwrite]) +AT_SETUP([ovsdb-log - write, add corrupted data, read, overwrite]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -289,7 +289,7 @@ file: read: end of log AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write, corrupt some data, read, overwrite]) +AT_SETUP([ovsdb-log - write, corrupt some data, read, overwrite]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -322,7 +322,7 @@ file: read: end of log AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write, truncate file, read, overwrite]) +AT_SETUP([ovsdb-log - write, truncate file, read, overwrite]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( @@ -355,7 +355,7 @@ file: read: end of log AT_CHECK([test -f .file.~lock~]) AT_CLEANUP -AT_SETUP([write bad JSON, read, overwrite]) +AT_SETUP([ovsdb-log - write bad JSON, read, overwrite]) AT_KEYWORDS([ovsdb log]) AT_CAPTURE_FILE([file]) AT_CHECK( diff --git a/tests/ovsdb-macros.at b/tests/ovsdb-macros.at index 503b8b722e5f..8dca0b79853c 100644 --- a/tests/ovsdb-macros.at +++ b/tests/ovsdb-macros.at @@ -32,7 +32,7 @@ m4_define([OVSDB_SERVER_SHUTDOWN], # # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_POSITIVE], - [AT_SETUP([$1]) + [AT_SETUP([ovsdb - $1]) AT_KEYWORDS([ovsdb positive $4]) AT_CHECK([test-ovsdb $2], [0], [$3 ], []) @@ -49,7 +49,7 @@ m4_define([OVSDB_CHECK_POSITIVE], # # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_POSITIVE_PY], - [AT_SETUP([$1]) + [AT_SETUP([ovsdb - $1]) $6 AT_KEYWORDS([ovsdb positive Python $4]) AT_CHECK([$PYTHON3 $srcdir/test-ovsdb.py $2], [0], [$3 @@ -70,7 +70,7 @@ m4_define([OVSDB_CHECK_POSITIVE_CPY], # status 1 and that its output on stdout contains substring OUTPUT. # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_NEGATIVE], - [AT_SETUP([$1]) + [AT_SETUP([ovsdb - $1]) AT_KEYWORDS([ovsdb negative $4]) AT_CHECK([test-ovsdb $2], [1], [], [stderr]) m4_assert(m4_len([$3])) @@ -90,7 +90,7 @@ m4_define([OVSDB_CHECK_NEGATIVE], # status 1 and that its output on stdout contains substring OUTPUT. # TITLE is provided to AT_SETUP and KEYWORDS to AT_KEYWORDS. m4_define([OVSDB_CHECK_NEGATIVE_PY], - [AT_SETUP([$1]) + [AT_SETUP([ovsdb - $1]) AT_KEYWORDS([ovsdb negative $4]) AT_CHECK([$PYTHON3 $srcdir/test-ovsdb.py $2], [1], [], [stderr]) m4_assert(m4_len([$3]))