From nobody Sat Feb 7 15:26:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528469884581467.9030478982801; Fri, 8 Jun 2018 07:58:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 822D230C10F8; Fri, 8 Jun 2018 14:58:03 +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 532C126E5C; Fri, 8 Jun 2018 14:58:03 +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 AAAE21800C9C; Fri, 8 Jun 2018 14:58:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w58EtHO1029540 for ; Fri, 8 Jun 2018 10:55:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 214722024CA4; Fri, 8 Jun 2018 14:55:17 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.81]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A44B2024CA1; Fri, 8 Jun 2018 14:55:16 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 8 Jun 2018 15:55:04 +0100 Message-Id: <20180608145507.11295-13-berrange@redhat.com> In-Reply-To: <20180608145507.11295-1-berrange@redhat.com> References: <20180608145507.11295-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [tck PATCH v2 12/15] lib: use Test::More directly instead of Test::Builder 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 08 Jun 2018 14:58:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Laine Stump --- lib/Sys/Virt/TCK.pm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index 29280f6..1a835bd 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -35,7 +35,7 @@ use XML::XPath; use Carp qw(cluck carp); use Fcntl qw(O_RDONLY SEEK_END); =20 -use Test::Builder; +use Test::More; use Sub::Uplevel qw(uplevel); use base qw(Exporter); =20 @@ -1035,8 +1035,6 @@ sub _try_as_caller { }; =20 =20 -my $Tester =3D Test::Builder->new; - sub ok_object($$$;$) { my $coderef =3D shift; my $class =3D shift; @@ -1052,16 +1050,16 @@ sub ok_object($$$;$) { $ret && ref($ret) && $ret->isa($class) && (!defined $name || ($ret->get_name() eq $name)); =20 - $Tester->ok($ok, $description); + ok($ok, $description); unless ($ok) { - $Tester->diag("expected $class object" . ($name ? " with name $nam= e" : "")); + diag("expected $class object" . ($name ? " with name $name" : "")); if ($exception) { - $Tester->diag("found '$exception'"); + diag("found '$exception'"); } else { if ($ret && ref($ret) && $ret->isa($class)) { - $Tester->diag("found $class object with name " . $ret->get= _name); + diag("found $class object with name " . $ret->get_name); } else { - $Tester->diag("found '$ret'"); + diag("found '$ret'"); } } } @@ -1137,10 +1135,10 @@ sub ok_error(&$;$) { my $ok =3D ref($exception) && $exception->isa("Sys::Virt::Error") && (!defined $code || ($exception->code() =3D=3D $code)); =20 - $Tester->ok($ok, $description); + ok($ok, $description); unless ($ok) { - $Tester->diag("expecting Sys::Virt::Error object" . ($code ? " wi= th code $code" : "")); - $Tester->diag("found '$exception'"); + diag("expecting Sys::Virt::Error object" . ($code ? " with code $= code" : "")); + diag("found '$exception'"); } $@ =3D $exception; return $ok; --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list