From nobody Mon Feb 9 09:22:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617972685; cv=none; d=zohomail.com; s=zohoarc; b=TvoEyXYlLyf0pJkDrpFct+WIBeUDFp2Bz7J4EJmkjS0y0xE+DfYEZSDuF2XihFuPOBb/Zimq8il/Z2sW0wmeqHNs1PBqQ82Q1LGXcqjjltSVIFakJmMC+QJueThdJFedW7DAwk6eLN+jAlF6s8Rw03xWKkIYKx/jWVAwIXAZqKE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617972685; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8iOrpduHRj5mfndC12wXMQPxNXhyYoTEYaojUyRpbMU=; b=lCEs7wkONSc3MTbtYgnZfhGfUeUhYQrulrljCm1Wm2G2j1xRqkGnCgnvKuncDVVEokYAEA80A4yDtVQ/QRSjuvqSb4HLAObVCSdeA2Tv3RBvMGeyGQm10cENNJQc+B0JIXflUGmhtBN0UDgvi+dYeL6zDZB/L+qIf9rr4E7QyVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1617972685785546.9550331804537; Fri, 9 Apr 2021 05:51:25 -0700 (PDT) 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-108-jqYe8CWZOTutB-knL6Lung-1; Fri, 09 Apr 2021 08:51:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E23BA107ACCD; Fri, 9 Apr 2021 12:51:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B702F1037E99; Fri, 9 Apr 2021 12:51:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7AEB91806D21; Fri, 9 Apr 2021 12:51:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 139CpFSX008711 for ; Fri, 9 Apr 2021 08:51:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id A21F65C3E9; Fri, 9 Apr 2021 12:51:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09FB25C541 for ; Fri, 9 Apr 2021 12:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617972684; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8iOrpduHRj5mfndC12wXMQPxNXhyYoTEYaojUyRpbMU=; b=gJ7m0H7mklj5/FXJ0ktiOMfDOksYkNIW92hMeQJxZpvPtuHW3A7OcyhOZ7keuUUx9aGh4D 5VDyEZsootLkCVs1Kq4iuoxNJogv/32mR99CZ4sXL6OMmTQOZl4TMgi5g1MDgrcWgjbm5u gSjsr5BZtsGH35XOc0ozVe7ey2sySD4= X-MC-Unique: jqYe8CWZOTutB-knL6Lung-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 11/25] nwfilterebiptablestest: Strip path from test output via virCommandSetDryRun Date: Fri, 9 Apr 2021 14:50:13 +0200 Message-Id: <9131e0443e97363551d4f835d0e3431a1ac302e2.1617972294.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Enable the internal path clearing instead of using virTestClearCommandPath. Signed-off-by: Peter Krempa --- tests/nwfilterebiptablestest.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index c20b2bed42..5f504cbe64 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -105,13 +105,12 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque = G_GNUC_UNUSED) int ret =3D -1; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); - virCommandSetDryRun(dryRunToken, &buf, false, false, NULL, NULL); + virCommandSetDryRun(dryRunToken, &buf, false, true, NULL, NULL); if (ebiptables_driver.allTeardown("vnet0") < 0) goto cleanup; actual =3D virBufferContentAndReset(&buf); - virTestClearCommandPath(actual); if (STRNEQ_NULLABLE(actual, expected)) { virTestDifference(stderr, expected, actual); @@ -172,13 +171,12 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque= G_GNUC_UNUSED) int ret =3D -1; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); - virCommandSetDryRun(dryRunToken, &buf, false, false, NULL, NULL); + virCommandSetDryRun(dryRunToken, &buf, false, true, NULL, NULL); if (ebiptables_driver.tearOldRules("vnet0") < 0) goto cleanup; actual =3D virBufferContentAndReset(&buf); - virTestClearCommandPath(actual); if (STRNEQ_NULLABLE(actual, expected)) { virTestDifference(stderr, expected, actual); @@ -217,13 +215,12 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *op= aque G_GNUC_UNUSED) int ret =3D -1; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); - virCommandSetDryRun(dryRunToken, &buf, false, false, NULL, NULL); + virCommandSetDryRun(dryRunToken, &buf, false, true, NULL, NULL); if (ebiptables_driver.removeBasicRules("vnet0") < 0) goto cleanup; actual =3D virBufferContentAndReset(&buf); - virTestClearCommandPath(actual); if (STRNEQ_NULLABLE(actual, expected)) { virTestDifference(stderr, expected, actual); @@ -247,13 +244,12 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque= G_GNUC_UNUSED) int ret =3D -1; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); - virCommandSetDryRun(dryRunToken, &buf, false, false, NULL, NULL); + virCommandSetDryRun(dryRunToken, &buf, false, true, NULL, NULL); if (ebiptables_driver.tearNewRules("vnet0") < 0) goto cleanup; actual =3D virBufferContentAndReset(&buf); - virTestClearCommandPath(actual); if (STRNEQ_NULLABLE(actual, expected)) { virTestDifference(stderr, expected, actual); @@ -315,13 +311,12 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opa= que G_GNUC_UNUSED) virMacAddr mac =3D { .addr =3D { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60 } = }; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); - virCommandSetDryRun(dryRunToken, &buf, false, false, NULL, NULL); + virCommandSetDryRun(dryRunToken, &buf, false, true, NULL, NULL); if (ebiptables_driver.applyBasicRules("vnet0", &mac) < 0) goto cleanup; actual =3D virBufferContentAndReset(&buf); - virTestClearCommandPath(actual); if (STRNEQ_NULLABLE(actual, expected)) { virTestDifference(stderr, expected, actual); @@ -401,13 +396,12 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *= opaque G_GNUC_UNUSED) }; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); - virCommandSetDryRun(dryRunToken, &buf, false, false, NULL, NULL); + virCommandSetDryRun(dryRunToken, &buf, false, true, NULL, NULL); if (ebiptables_driver.applyDHCPOnlyRules("vnet0", &mac, &val, false) <= 0) goto cleanup; actual =3D virBufferContentAndReset(&buf); - virTestClearCommandPath(actual); if (STRNEQ_NULLABLE(actual, expected)) { virTestDifference(stderr, expected, actual); @@ -470,13 +464,12 @@ testNWFilterEBIPTablesApplyDropAllRules(const void *o= paque G_GNUC_UNUSED) int ret =3D -1; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); - virCommandSetDryRun(dryRunToken, &buf, false, false, NULL, NULL); + virCommandSetDryRun(dryRunToken, &buf, false, true, NULL, NULL); if (ebiptables_driver.applyDropAllRules("vnet0") < 0) goto cleanup; actual =3D virBufferContentAndReset(&buf); - virTestClearCommandPath(actual); if (STRNEQ_NULLABLE(actual, expected)) { virTestDifference(stderr, expected, actual); --=20 2.30.2