From 46387084f6d0e09207354daed3fe2531035d638d Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 15 Jan 2020 00:59:14 +0100 Subject: fix testsuite errors on CentOs (NVR vs NVRA) where rpmquery default to outputing NVRA (vs NVR on Mageia) reuse check_installed_fullnames() where needed instead of introducing %{NVR} --- t/superuser--rpmnew.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 't/superuser--rpmnew.t') diff --git a/t/superuser--rpmnew.t b/t/superuser--rpmnew.t index 80a492c7..cb6e3e31 100644 --- a/t/superuser--rpmnew.t +++ b/t/superuser--rpmnew.t @@ -92,15 +92,15 @@ sub test { my ($cmd, $v1, $v2, $v3) = @_; system_("$cmd media/$medium_name/a-1-*.rpm"); - is(`rpm -qa --root $::pwd/root`, "a-1-1\n"); + check_installed_fullnames("a-1-1"); check_content('a-1', @$v1); system_("$cmd media/$medium_name/a-2-*.rpm"); - is(`rpm -qa --root $::pwd/root`, "a-2-1\n"); + check_installed_fullnames("a-2-1"); check_content('a-2', @$v2); system_("$cmd media/$medium_name/a-3-*.rpm"); - is(`rpm -qa --root $::pwd/root`, "a-3-1\n"); + check_installed_fullnames("a-3-1"); check_content('a-3', @$v3); system_("rpm --root $::pwd/root -e a"); -- cgit v1.2.1