diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-01-18 10:07:11 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-01-18 10:07:11 +0000 |
| commit | 1552f8682706dd1b9b95365b64d663bb38589ef5 (patch) | |
| tree | 2c347eca02c10cd9ef4dfda5ddcc63865d49f08f | |
| parent | 14483fcf80d1f2977753b7d5012ee48a602c7833 (diff) | |
| download | urpmi-1552f8682706dd1b9b95365b64d663bb38589ef5.tar urpmi-1552f8682706dd1b9b95365b64d663bb38589ef5.tar.gz urpmi-1552f8682706dd1b9b95365b64d663bb38589ef5.tar.bz2 urpmi-1552f8682706dd1b9b95365b64d663bb38589ef5.tar.xz urpmi-1552f8682706dd1b9b95365b64d663bb38589ef5.zip | |
cleanup using run_urpm_cmd
| -rw-r--r-- | t/superuser--README-urpmi.t | 4 | ||||
| -rw-r--r-- | t/superuser--media_info_dir.t | 4 | ||||
| -rw-r--r-- | t/superuser--split-transactions--promote.t | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/t/superuser--README-urpmi.t b/t/superuser--README-urpmi.t index 318e1f67..c72384a1 100644 --- a/t/superuser--README-urpmi.t +++ b/t/superuser--README-urpmi.t @@ -42,9 +42,7 @@ sub test_d { sub test_urpmi { my ($para, @wanted) = @_; - my $urpmi = urpmi_cmd(); - print "# $urpmi $para\n"; - my $s = `$urpmi $para`; + my $s = run_urpm_cmd("urpmi $para"); print $s; my @msgs = $s =~ /\nMore information on package[^\n]*\n(.*?)\n-{70}/msg; diff --git a/t/superuser--media_info_dir.t b/t/superuser--media_info_dir.t index 599ffde1..7d07d011 100644 --- a/t/superuser--media_info_dir.t +++ b/t/superuser--media_info_dir.t @@ -74,9 +74,7 @@ sub rpm_v3 { foreach my $src_rpm (glob('media/rpm-v3/*.rpm')) { my ($wanted_arch) = $src_rpm =~ /(\w+)\.rpm$/; - my $cmd = urpm_cmd('urpmq') . " -f $src_rpm"; - warn "# $cmd\n"; - chomp(my $fullname = `$cmd`); + chomp(my $fullname = run_urpm_cmd("urpmq -f $src_rpm")); my ($arch) = $fullname =~ /(\w+)$/; if (rpm_is_jbj_version()) { diff --git a/t/superuser--split-transactions--promote.t b/t/superuser--split-transactions--promote.t index cf8394f8..69b8e208 100644 --- a/t/superuser--split-transactions--promote.t +++ b/t/superuser--split-transactions--promote.t @@ -116,7 +116,6 @@ sub test_conflict_gh { sub run_urpmi_and_get_conflicts { my ($para) = @_; - my $cmd = urpmi_cmd() . " $para"; - my $output = `$cmd`; + my $output = run_urpm_cmd("urpmi $para"); $output =~ /\(due to conflicts with (.*)\)/g; } |