diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2006-11-30 17:57:43 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2006-11-30 17:57:43 +0000 |
commit | 62c1446f09cc16428431510218e5e4f1e06271f3 (patch) | |
tree | a0a3601c5138ac60d2a92752b196ab6bea6c4008 /t/superuser--exclude.t | |
parent | 981c22ad5c1752789bbccd1e09302c2123d930d2 (diff) | |
download | urpmi-62c1446f09cc16428431510218e5e4f1e06271f3.tar urpmi-62c1446f09cc16428431510218e5e4f1e06271f3.tar.gz urpmi-62c1446f09cc16428431510218e5e4f1e06271f3.tar.bz2 urpmi-62c1446f09cc16428431510218e5e4f1e06271f3.tar.xz urpmi-62c1446f09cc16428431510218e5e4f1e06271f3.zip |
more tests, clean some others, enhance helper.pm
Diffstat (limited to 't/superuser--exclude.t')
-rw-r--r-- | t/superuser--exclude.t | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/t/superuser--exclude.t b/t/superuser--exclude.t index 44a2a1a3..24abb189 100644 --- a/t/superuser--exclude.t +++ b/t/superuser--exclude.t @@ -1,26 +1,20 @@ #!/usr/bin/perl use strict; +use lib '.', 't'; +use helper; use Test::More 'no_plan'; BEGIN { use_ok 'urpm::cfg' } BEGIN { use_ok 'urpm::download' } -chdir 't' if -d 't'; -require './helper.pm'; - -helper::need_root_and_prepare(); +need_root_and_prepare(); my $name = 'various'; -my $urpmi_debug_opt = '-q';#'-v --debug'; -my $urpmi_addmedia = "perl -I.. ../urpmi.addmedia $urpmi_debug_opt --urpmi-root $::pwd/root"; -my $urpmi = "perl -I.. ../urpmi $urpmi_debug_opt --urpmi-root $::pwd/root --ignoresize"; -my $urpme = "perl -I.. ../urpme --urpmi-root $::pwd/root"; - my @want = `rpm -qpl media/$name/$name-1-1.*.rpm`; -system_("$urpmi_addmedia $name $::pwd/media/$name"); +urpmi_addmedia("$name $::pwd/media/$name"); foreach ([ '', \@want ], [ '--excludedocs', [ grep { !m!^/usr/share/doc! } @want ] ], @@ -44,18 +38,18 @@ sub test_rpm_cmdline { sub test_urpmi_cmdline { my ($option, $want) = @_; - system_("$urpmi $option $name"); + urpmi("$option $name"); check("urpmi $option", $want); - system_("$urpme $name"); + urpme($name); check('rpm -e', []); } sub test_urpmi_through_urpmi_cfg { my ($option, $want) = @_; set_urpmi_cfg_global_options(cmdline2hash($option)); - system_("$urpmi $name"); + urpmi($name); check("urpmi ($option in urpmi.cfg)", $want); - system_("$urpme $name"); + urpme($name); check('rpm -e', []); set_urpmi_cfg_global_options({}); } @@ -85,11 +79,4 @@ sub filter_urpmi_rpm_files { grep { !m!^(/dev/null|/etc/urpmi|/etc/rpm/macros|/var/(cache|lib)/(urpmi|rpm))! } @_; } -sub system_ { - my ($cmd) = @_; - system($cmd); - ok($? == 0, $cmd); -} sub difference2 { my %l; @l{@{$_[1]}} = (); grep { !exists $l{$_} } @{$_[0]} } - -END { system('rm -rf root') } |