From b0740bb0a7329249cb0372fe589709b8c8abda6f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 28 Jan 2009 13:59:18 +0000
Subject: - drop support for /etc/urpmi/media.d/*.cfg   (was partially broken,
 non documented and hopefully unused)

(mostly reverting commit 234656 which introduced that feature)
---
 t/helper.pm             | 26 --------------------------
 t/superuser--addmedia.t | 22 ----------------------
 2 files changed, 48 deletions(-)

(limited to 't')

diff --git a/t/helper.pm b/t/helper.pm
index 005eadfe..a7959dae 100644
--- a/t/helper.pm
+++ b/t/helper.pm
@@ -7,7 +7,6 @@ our @EXPORT = qw(need_root_and_prepare
 		 urpmi_addmedia urpmi_removemedia urpmi_update
 		 urpm_cmd run_urpm_cmd urpmi_cmd urpmi test_urpmi_fail urpme
 		 urpmi_cfg set_urpmi_cfg_global_options
-		 create_media_d_cfg media_d_cfg
 		 system_ system_should_fail
 		 rpm_is_jbj_version
 		 check_installed_fullnames check_installed_names check_nothing_installed
@@ -102,31 +101,6 @@ sub set_urpmi_cfg_global_options {
     ok(urpm::cfg::dump_config(urpmi_cfg(), $config), 'set_urpmi_cfg_global_options');
 }
 
-sub media_d_dir {
-    "$::pwd/root/etc/urpmi/media.d";
-}
-sub media_d_cfg {
-    my ($name) = @_;
-    media_d_dir() . "/$name.cfg";
-}
-sub create_media_d_cfg {
-    my ($name, @l) = @_;
-
-    system("install -d " . media_d_dir());
-    my $cfg = media_d_cfg($name);
-    -e $cfg and die "$cfg already exists\n";
-    open(my $F, '>', $cfg);
-
-    my $cnt = 1;
-    foreach my $h (@l) {
-	my %h = %$h;
-	my $section = delete $h{'with-dir'} || $cnt++;
-	print $F "[$section]\n";
-	print $F "$_ = $h->{$_}\n" foreach keys %$h;
-    }
-}
-
-
 sub system_ {
     my ($cmd) = @_;
     system($cmd);
diff --git a/t/superuser--addmedia.t b/t/superuser--addmedia.t
index d43cbd50..ffe2ff14 100644
--- a/t/superuser--addmedia.t
+++ b/t/superuser--addmedia.t
@@ -17,9 +17,6 @@ my @fields = qw(hdlist synthesis with_synthesis media_info_dir no-media-info lis
 
 test_reconfig();
 
-try_media_d_1();
-try_media_d_2();
-
 try_medium({}, '');
 
 
@@ -149,25 +146,6 @@ sub check_urpmi {
     check_installed_and_remove(@names);
 }
 
-sub try_media_d_1 {
-    create_media_d_cfg($name, { name => $name, url => "$::pwd/media/$name" });
-    check_urpmi($name);    
-
-    create_media_d_cfg($name2, { name => $name2, url => "$::pwd/media/$name2" });
-    check_urpmi($name2);
-
-    ok(unlink media_d_cfg($name));
-    ok(unlink media_d_cfg($name2));
-}
-sub try_media_d_2 {
-    create_media_d_cfg($name, 
-		       { name => $name, url => "$::pwd/media/$name" }, 
-		       { name => $name2, url => "$::pwd/media/$name2" });
-    check_urpmi($name, $name2);
-
-    ok(unlink media_d_cfg($name));
-}
-
 sub test_reconfig {
     urpmi_addmedia("reconfig $::pwd/media/reconfig");
     check_conf({ name => 'reconfig', url => "$::pwd/media/$name" });
-- 
cgit v1.2.1