From nobody Mon Feb 9 04:44:31 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=1617972767; cv=none; d=zohomail.com; s=zohoarc; b=isFxv68nqOsgBJrDDGfJN80Msswq3zxsvJ9Himn/oVPXpfHpV31QIU3yjvUkL8Y8tNgCc3AYIyq/lFSiv4SQQGKt9RQj63NLOIESFRaOviUoZKI+qAdEtrqdu/6i1viYeMhiC7qmzXmjZ3jTHDqykP5Kgxxm9I5391V4faE6UGU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617972767; 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=+90nG3DF5sG9ocFQcnNmDF6+vuCLqWiOSKC9JjCXYT4=; b=SOdMuTNMj3Ln+mlygeBuifpqLSp3vdCcIrwheDfvD8oswdVfQ1P8lYPie8Ik1p9UEQ2bCj71aHm2DtwL2bR/lR8162RfH31i1hO2ePa2WfNqZUxeLab34a4ROIYSckcSNsa3KcwSHODg1Sfst5hVS8GJjvkOpZWUJIoj4pBmT+0= 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 1617972767132859.5151778096207; Fri, 9 Apr 2021 05:52:47 -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-470-5HwzKDu7PNKk-n6m82i46g-1; Fri, 09 Apr 2021 08:52:44 -0400 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 75D6483DD23; Fri, 9 Apr 2021 12:52:38 +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 52A305D9C0; Fri, 9 Apr 2021 12:52:38 +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 1601C1806D10; Fri, 9 Apr 2021 12:52:38 +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 139CqYIg009320 for ; Fri, 9 Apr 2021 08:52:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id ADE875C1D5; Fri, 9 Apr 2021 12:52:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1548E5C1A1 for ; Fri, 9 Apr 2021 12:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617972766; 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=+90nG3DF5sG9ocFQcnNmDF6+vuCLqWiOSKC9JjCXYT4=; b=iJKImX/S6bBRD8AF/8LPIvHZba+7KrODwovZ3v7aOlt0lejQbYNXZNp2sC+vU2kwfZ9EZm OUrJpb3R8D4hV/S7QKGliHBh0lqZPc3s+io3DOXmdtODGoBk9Rt9uVem2xHMFfvmk43XrQ iXNTUHsIavtzF4qwe7Pp6H7grgj4Uhc= X-MC-Unique: 5HwzKDu7PNKk-n6m82i46g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 21/25] networkxml2firewalltest: Use internal wrapping of command line arguments Date: Fri, 9 Apr 2021 14:50:23 +0200 Message-Id: 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.79 on 10.5.11.14 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" virCommandSetDryRun allows to invoke virCommandToString so that the command string is already wrapped. We now also need to load the base arguments file without unwrapping the arguments. Signed-off-by: Peter Krempa --- tests/networkxml2firewalltest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 16249c49fd..60cd79eeb2 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -98,7 +98,7 @@ static int testCompareXMLToArgvFiles(const char *xml, char *actual; g_autoptr(virCommandDryRunToken) dryRunToken =3D virCommandDryRunToken= New(); - virCommandSetDryRun(dryRunToken, &buf, false, true, testCommandDryRun,= NULL); + virCommandSetDryRun(dryRunToken, &buf, true, true, testCommandDryRun, = NULL); if (!(def =3D virNetworkDefParseFile(xml, NULL))) goto cleanup; @@ -115,7 +115,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (STRPREFIX(actual, baseargs)) actual +=3D strlen(baseargs); - if (virTestCompareToFile(actual, cmdline) < 0) + if (virTestCompareToFileFull(actual, cmdline, false) < 0) goto cleanup; ret =3D 0; @@ -189,7 +189,7 @@ mymain(void) basefile =3D g_strdup_printf("%s/networkxml2firewalldata/base.args", a= bs_srcdir); - if (virTestLoadFile(basefile, &baseargs) < 0) + if (virFileReadAll(basefile, INT_MAX, &baseargs) < 0) return EXIT_FAILURE; DO_TEST("nat-default"); --=20 2.30.2