summaryrefslogtreecommitdiffstats
path: root/t/superuser--media_info_dir.t
diff options
context:
space:
mode:
Diffstat (limited to 't/superuser--media_info_dir.t')
-rw-r--r--t/superuser--media_info_dir.t13
1 files changed, 5 insertions, 8 deletions
diff --git a/t/superuser--media_info_dir.t b/t/superuser--media_info_dir.t
index 9cb623f0..70d620a8 100644
--- a/t/superuser--media_info_dir.t
+++ b/t/superuser--media_info_dir.t
@@ -12,30 +12,27 @@ rpm_v3();
sub various {
my $name = 'various';
- foreach my $medium_name ('various', 'various_nohdlist', 'various_no_subdir') {
- urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
+ foreach my $medium_name ('various', 'various_nohdlist', 'various nohdlist', 'various_no_subdir') {
+ urpmi_addmedia("'$medium_name' '$::pwd/media/$medium_name'");
urpmi($name);
is(`rpm -qa --root $::pwd/root`, "$name-1-1\n");
urpme($name);
- urpmi_removemedia($medium_name);
+ urpmi_removemedia("'$medium_name'");
}
}
sub rpm_v3 {
my @names = qw(libtermcap nls p2c);
- my $check_installed = sub {
- is(`rpm -qa --qf '%{name}\\n' --root $::pwd/root | sort`, join('', map { "$_\n" } @names));
- };
system_("rpm --root $::pwd/root -i --noscripts media/rpm-v3/*.rpm");
- $check_installed->();
+ check_installed_names(@names);
system_("rpm --root $::pwd/root -e --noscripts " . join(' ', @names));
is(`rpm -qa --root $::pwd/root`, '');
foreach my $medium_name ('rpm-v3', 'rpm-v3_nohdlist', 'rpm-v3_no_subdir') {
urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
urpmi('--no-verify-rpm --noscripts ' . join(' ', @names));
- $check_installed->();
+ check_installed_names(@names);
urpme('-a --auto --noscripts');
is(`rpm -qa --root $::pwd/root`, '');
urpmi_removemedia($medium_name);