Commit 3b9635db authored by Dries's avatar Dries
Browse files

- Patch #714964 by mr.baileys: ActionLoopTestCase was fragile on some databases.

parent 2d2ff0d1
......@@ -81,7 +81,7 @@ class ActionLoopTestCase extends DrupalWebTestCase {
}
/**
* Set up a loop with 10-50 recursions, and see if it aborts properly.
* Set up a loop with 3 - 12 recursions, and see if it aborts properly.
*/
function testActionLoop() {
$user = $this->drupalCreateUser(array('administer actions'));
......@@ -116,10 +116,9 @@ class ActionLoopTestCase extends DrupalWebTestCase {
}
$expected[] = 'Stack overflow: too many calls to actions_do(). Aborting to prevent infinite recursion.';
$result = db_query("SELECT * FROM {watchdog} WHERE type = 'actions_loop_test' OR type = 'actions' ORDER BY timestamp");
$result = db_query("SELECT message FROM {watchdog} WHERE type = 'actions_loop_test' OR type = 'actions' ORDER BY wid");
$loop_started = FALSE;
foreach ($result as $row) {
$expected_message = array_shift($expected);
$this->assertEqual($row->message, $expected_message, t('Expected message %expected, got %message.', array('%expected' => $expected_message, '%message' => $row->message)));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment