summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-03 11:51:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-03 11:51:01 +0000
commit42ae1a540a742a0ab6c5525f59adf1fb84a9db26 (patch)
treea849c2bac5e9a99798d64bce252269e97e340cd8
parent5fce76fb3ad04f7a7de34c7b3c276b360e2a6ccb (diff)
downloadurpmi-42ae1a540a742a0ab6c5525f59adf1fb84a9db26.tar
urpmi-42ae1a540a742a0ab6c5525f59adf1fb84a9db26.tar.gz
urpmi-42ae1a540a742a0ab6c5525f59adf1fb84a9db26.tar.bz2
urpmi-42ae1a540a742a0ab6c5525f59adf1fb84a9db26.tar.xz
urpmi-42ae1a540a742a0ab6c5525f59adf1fb84a9db26.zip
"a" and "b" can be installed in any order, so sometimes "a" is first,
sometimes "b" is first
-rw-r--r--t/superuser--split-transactions.t14
1 files changed, 11 insertions, 3 deletions
diff --git a/t/superuser--split-transactions.t b/t/superuser--split-transactions.t
index 54e2bed4..1b8d3a61 100644
--- a/t/superuser--split-transactions.t
+++ b/t/superuser--split-transactions.t
@@ -14,7 +14,7 @@ need_root_and_prepare();
my $name = 'split-transactions';
urpmi_addmedia("$name $::pwd/media/$name");
-test_urpmi("--auto --split-length 1 c d", <<'EOF');
+test_urpmi("--auto --split-length 1 c d", <<'EOF', <<'EOF');
Preparing...
1/4: a
2/4: b
@@ -23,10 +23,18 @@ Preparing...
Preparing...
4/4: d
EOF
+Preparing...
+ 1/4: b
+ 2/4: a
+Preparing...
+ 3/4: c
+Preparing...
+ 4/4: d
+EOF
check_installed_names('a', 'b', 'c', 'd');
sub test_urpmi {
- my ($para, $wanted) = @_;
+ my ($para, $wanted_a, $wanted_b) = @_;
my $s = run_urpm_cmd("urpmi $para");
print $s;
@@ -34,5 +42,5 @@ sub test_urpmi {
$s =~ s/^installing .*//gm;
$s =~ s/^\n//gm;
- ok($s eq $wanted, "$wanted in $s");
+ ok($s eq $wanted_a || $s eq $wanted_b, "$wanted_a in $s");
}