From f2be43ab69e87c9c3ded8db93ab3b499acf04dfb Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 4 Oct 2012 14:41:48 +0000
Subject: drop support for rpm5

---
 t/helper.pm                   | 6 ------
 t/superuser--media_info_dir.t | 5 -----
 t/superuser--rpm.t            | 2 +-
 t/superuser--rpmnew.t         | 8 --------
 4 files changed, 1 insertion(+), 20 deletions(-)

(limited to 't')

diff --git a/t/helper.pm b/t/helper.pm
index 1980abb1..e1ae6655 100644
--- a/t/helper.pm
+++ b/t/helper.pm
@@ -8,7 +8,6 @@ our @EXPORT = qw(need_root_and_prepare
 		 urpm_cmd run_urpm_cmd urpmi_cmd urpmi urpmi_partial test_urpmi_fail urpme
 		 urpmi_cfg set_urpmi_cfg_global_options
 		 system_ system_should_fail
-		 rpm_is_jbj_version
 		 check_installed_fullnames check_installed_names check_nothing_installed
 		 check_installed_and_remove check_installed_fullnames_and_remove check_installed_and_urpme
 	    );
@@ -124,11 +123,6 @@ sub system_should_fail {
              : ok($? != 0, "should fail: $cmd");
 }
 
-sub rpm_is_jbj_version {
-    # checking for --yaml support
-    `rpm --help` =~ /yaml/;
-}
-
 sub check_installed_fullnames {
     my (@names) = @_;
     is(`rpm -qa --root $::pwd/root | sort`, join('', map { "$_\n" } sort(@names)));
diff --git a/t/superuser--media_info_dir.t b/t/superuser--media_info_dir.t
index 7d07d011..e40034cb 100644
--- a/t/superuser--media_info_dir.t
+++ b/t/superuser--media_info_dir.t
@@ -77,11 +77,6 @@ sub rpm_v3 {
 	chomp(my $fullname = run_urpm_cmd("urpmq -f $src_rpm"));
 	my ($arch) = $fullname =~ /(\w+)$/;
 
-	if (rpm_is_jbj_version()) {
-	    # WARNING: package has a Sourcerpm empty tag (#29809), but this package is broken anyway
-	    $wanted_arch = 'i386' if $src_rpm =~ /KBackup/;
-	}
-
 	is($arch, $wanted_arch, "$fullname should have arch $wanted_arch (found $arch)");
     }
 }
diff --git a/t/superuser--rpm.t b/t/superuser--rpm.t
index 9405e87b..9e4bad0a 100644
--- a/t/superuser--rpm.t
+++ b/t/superuser--rpm.t
@@ -8,7 +8,7 @@ use Test::More 'no_plan';
 my $name = 'rpm-query-in-scriptlet';
 
 need_root_and_prepare();
-rpm_is_jbj_version() or system_('mkdir -p root/var/lib/rpm');
+system_('mkdir -p root/var/lib/rpm');
 test_rpm_query_in_scriptlet();
 
 sub test_rpm_query_in_scriptlet {
diff --git a/t/superuser--rpmnew.t b/t/superuser--rpmnew.t
index 4aa530e7..d82f45f7 100644
--- a/t/superuser--rpmnew.t
+++ b/t/superuser--rpmnew.t
@@ -43,14 +43,6 @@ sub test2 {
 	 ['orig', 'orig', 'orig'],
 	 ['changed', 'changed', 'changed']);
 
-    if (rpm_is_jbj_version()) {
-	#- WARNING: those files have no added value
-	#- (since the file was created with same content)
-	#- and should not be there
-	ok(unlink "$::pwd/root/etc/config.rpmorig");
-	ok(unlink "$::pwd/root/etc/config-noreplace.rpmnew");
-    }
-
     check_no_etc_files();
 }
 
-- 
cgit v1.2.1