diff options
| -rw-r--r-- | t/superuser--obsolete-and-conflict.t | 3 | ||||
| -rw-r--r-- | t/superuser--specify-media.t | 6 | ||||
| -rw-r--r-- | t/superuser--split-transactions.t | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/t/superuser--obsolete-and-conflict.t b/t/superuser--obsolete-and-conflict.t index 80fea2a5..545ede1e 100644 --- a/t/superuser--obsolete-and-conflict.t +++ b/t/superuser--obsolete-and-conflict.t @@ -47,8 +47,7 @@ sub test_with_ad { sub test_urpmi { my ($para, $wanted) = @_; - my $urpmi = urpmi_cmd(); - my $s = `$urpmi $para`; + my $s = run_urpm_cmd("urpmi $para"); $s =~ s/\s*#{40}#*//g; $s =~ s/.*\nPreparing\.\.\.\n//s; diff --git a/t/superuser--specify-media.t b/t/superuser--specify-media.t index b2548834..31e4c6a5 100644 --- a/t/superuser--specify-media.t +++ b/t/superuser--specify-media.t @@ -34,8 +34,7 @@ test_urpmi("--sortmedia $media[1],$media[0]", $media_dirs[1], $media[0]); sub test_urpmq { my ($para, @wanted) = @_; - my $urpmq = urpm_cmd('urpmq'); - my @l = `$urpmq $para --sources $name`; + my @l = run_urpm_cmd("urpmq $para --sources $name"); foreach my $dir (@wanted) { my $found = shift @l; is(dirname($found), $dir); @@ -44,8 +43,7 @@ sub test_urpmq { sub test_urpmi { my ($para, $wanted, $bad) = @_; - my $urpmi = urpmi_cmd(); - my $s = `$urpmi $para $name`; + my $s = run_urpm_cmd("urpmi $para $name"); $s =~ s/^Preparing.*//sm; ok($s =~ m!^installing $name\S* from $wanted$!m, "$wanted in $s"); diff --git a/t/superuser--split-transactions.t b/t/superuser--split-transactions.t index 81b85539..54e2bed4 100644 --- a/t/superuser--split-transactions.t +++ b/t/superuser--split-transactions.t @@ -27,8 +27,7 @@ check_installed_names('a', 'b', 'c', 'd'); sub test_urpmi { my ($para, $wanted) = @_; - my $urpmi = urpmi_cmd(); - my $s = `$urpmi $para`; + my $s = run_urpm_cmd("urpmi $para"); print $s; $s =~ s/\s*#{40}#*//g; |