Fix TestSessionState and TestSessionEnvironment

Fixing a bug that makes it only wait for pending requests, but
not for some time after the last response
This commit is contained in:
Serge Latyntcev 2019-01-10 11:48:59 +13:00
parent fc0f7baa11
commit 32c8e6a3b1
2 changed files with 20 additions and 12 deletions

View File

@ -573,24 +573,22 @@ class TestSessionEnvironment
*/ */
public function waitForPendingRequests($await = 700, $timeout = 10000) public function waitForPendingRequests($await = 700, $timeout = 10000)
{ {
$now = static function () { $timeout = TestSessionState::microtime() + $timeout;
return microtime(true) * 10000;
};
$timeout = $now() + $timeout;
$interval = max(300, $await); $interval = max(300, $await);
do { do {
$now = TestSessionState::microtime();
if ($timeout < $now) {
return false;
}
$model = TestSessionState::get()->byID(1); $model = TestSessionState::get()->byID(1);
$pendingRequests = $model->PendingRequests > 0; $pendingRequests = $model->PendingRequests > 0;
$lastRequestAwait = ($model->LastResponseTimestamp + $await) > $now(); $lastRequestAwait = ($model->LastResponseTimestamp + $await) > $now;
$pending = $pendingRequests || $lastRequestAwait; $pending = $pendingRequests || $lastRequestAwait;
if ($timeout < $now()) {
// timed out
return false;
}
} while ($pending && (usleep($interval * 1000) || true)); } while ($pending && (usleep($interval * 1000) || true));
return true; return true;

View File

@ -53,8 +53,18 @@ class TestSessionState extends DataObject
$update = SQLUpdate::create(sprintf('"%s"', $schema->tableName(self::class))) $update = SQLUpdate::create(sprintf('"%s"', $schema->tableName(self::class)))
->addWhere(['ID' => 1]) ->addWhere(['ID' => 1])
->assignSQL('"PendingRequests"', '"PendingRequests" - 1') ->assignSQL('"PendingRequests"', '"PendingRequests" - 1')
->assign('"LastResponseTimestamp"', microtime(true) * 10000); ->assign('"LastResponseTimestamp"', self::microtime());
$update->execute(); $update->execute();
} }
/**
* Returns unix timestamp in milliseconds
*
* @return float milliseconds since 1970
*/
public static function microtime()
{
return round(microtime(true) * 1000);
}
} }