g2 Sat Jun 27 23:57:46 2009 UTC
Modified files:
/phpruntests/src/taskScheduler rtTaskScheduler.php
rtTaskSchedulerFile.php
/phpruntests/tests rtTaskSchedulerTest.php
Log:
phpruntests - minor bugfix task-scheduler
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskScheduler.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskScheduler.php
diff -u phpruntests/src/taskScheduler/rtTaskScheduler.php:1.2
phpruntests/src/taskScheduler/rtTaskScheduler.php:1.3
--- phpruntests/src/taskScheduler/rtTaskScheduler.php:1.2 Sat Jun 27
13:29:32 2009
+++ phpruntests/src/taskScheduler/rtTaskScheduler.php Sat Jun 27 23:57:46 2009
@@ -107,24 +107,21 @@
$task = $this->taskList[$i];
if ($task->run() === true) {
- $task->setState(task::PASS);
+ $task->setState(rtTask::PASS);
$this->countPass++;
} else {
- $task->setState(task::FAIL);
+ $task->setState(rtTask::FAIL);
$this->countFail++;
}
$this->memStore[] = memory_get_usage(true);
-
- print ".";
- flush();
-
+
$this->taskList[$i] = $task;
}
$error = microtime(true);
- $this->time = round($error-$s,5);
+ $this->time = round($e-$s,5);
return;
}
http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskSchedulerFile.php?r1=1.1&r2=1.2&diff_format=u
Index: phpruntests/src/taskScheduler/rtTaskSchedulerFile.php
diff -u phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.1
phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.2
--- phpruntests/src/taskScheduler/rtTaskSchedulerFile.php:1.1 Fri Jun 26
00:07:24 2009
+++ phpruntests/src/taskScheduler/rtTaskSchedulerFile.php Sat Jun 27
23:57:46 2009
@@ -151,8 +151,6 @@
if ($this->groupTasks == true) {
- $c = 0;
-
foreach ($this->taskList as $key => $list) {
for ($i=0; $i<sizeof($list); $i++) {
@@ -165,7 +163,13 @@
for ($i=0; $i<sizeof($this->taskList); $i++) {
- $taskStr[$i%$this->processCount] .= $i.';';
+ $cid = $i%$this->processCount;
+
+ if (!isset($taskStr[$cid])) {
+ $taskStr[$cid] = '';
+ }
+
+ $taskStr[$cid] .= $i.';';
}
}
http://cvs.php.net/viewvc.cgi/phpruntests/tests/rtTaskSchedulerTest.php?r1=1.1&r2=1.2&diff_format=u
Index: phpruntests/tests/rtTaskSchedulerTest.php
diff -u phpruntests/tests/rtTaskSchedulerTest.php:1.1
phpruntests/tests/rtTaskSchedulerTest.php:1.2
--- phpruntests/tests/rtTaskSchedulerTest.php:1.1 Fri Jun 26 00:07:24 2009
+++ phpruntests/tests/rtTaskSchedulerTest.php Sat Jun 27 23:57:46 2009
@@ -7,10 +7,11 @@
{
public function testResult()
{
- // create 10 tasks with random numbers
$taskList = array();
$expected = array();
+ $results = array();
+ // create 10 tasks with random numbers
for ($i=0; $i<10; $i++) {
$n = rand(0,9);
$expected[$i] = $n+1;
@@ -24,8 +25,6 @@
$scheduler->run();
// get the results from the manupilated task-list
- $results = array();
-
foreach ($scheduler->getTaskList() as $task) {
$results[] = $task->getNumber();
}
@@ -61,5 +60,4 @@
}
}
-
-?>
+?>
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
