Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-11-05 16:25:14+01:00, msvensson@stripped +1 -0
Fix unit test after renaming wait -> wait_one, and fix it's return code
mysql-test/lib/t/SafeProcess.t@stripped, 2007-11-05 16:25:07+01:00, msvensson@stripped
+4 -4
Fix unit test after renaming wait -> wait_one, and fix it's return code
diff -Nrup a/mysql-test/lib/t/SafeProcess.t b/mysql-test/lib/t/SafeProcess.t
--- a/mysql-test/lib/t/SafeProcess.t 2007-11-02 09:53:20 +01:00
+++ b/mysql-test/lib/t/SafeProcess.t 2007-11-05 16:25:07 +01:00
@@ -25,7 +25,7 @@ my $perl_path= $^X;
error => "/dev/null",
);
# Wait max 10 seconds for the process to finish
- $ok_count++ if ($proc->wait(10) and
+ $ok_count++ if ($proc->wait_one(10) == 0 and
$proc->exit_status() == $code);
}
ok($count == $ok_count, "check exit_status, $ok_count");
@@ -50,7 +50,7 @@ my $perl_path= $^X;
}
for my $code (0..$count-1) {
- $ok_count++ if ($procs{$code}->wait(10) and
+ $ok_count++ if ($procs{$code}->wait_one(10) == 0 and
$procs{$code}->exit_status() == $code);
}
ok($count == $ok_count, "concurrent, $ok_count");
@@ -73,7 +73,7 @@ my $perl_path= $^X;
error => "$dir/error.txt",
);
- $proc->wait(2); # Wait max 2 seconds for the process to finish
+ $proc->wait_one(2); # Wait max 2 seconds for the process to finish
local undef $/; # Slurp
my $fh= IO::File->new("$dir/output.txt");
@@ -91,7 +91,7 @@ my $perl_path= $^X;
debug => 1,
);
- $proc->wait(2); # Wait max 2 seconds for the process to finish
+ $proc->wait_one(2); # Wait max 2 seconds for the process to finish
$fh= IO::File->new("$dir/output.txt");
local undef $/; # Slurp
| Thread |
|---|
| • bk commit into 5.0 tree (msvensson:1.2580) | msvensson | 5 Nov |