From 938c7c07a38129deeb4eabe805e3ae80db8ccead Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 22 Jan 2009 12:46:07 +0000 Subject: - Patch #360605 by Berdir: made CVS HEAD compatible with PHP5.3. --- modules/simpletest/simpletest.test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules/simpletest') diff --git a/modules/simpletest/simpletest.test b/modules/simpletest/simpletest.test index 3c4726526..d3934988d 100644 --- a/modules/simpletest/simpletest.test +++ b/modules/simpletest/simpletest.test @@ -147,7 +147,9 @@ class SimpleTestFunctionalTest extends DrupalWebTestCase { $this->assertAssertion('This is nothing.', 'Other', 'Pass', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()'); // Check that errors that occur inside PHP internal functions are correctly reported. - $this->assertAssertion('The second argument should be either an array or an object', 'Warning', 'Fail', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()'); + // The exact error message differs between PHP versions so we check only + // the function name 'array_key_exists'. + $this->assertAssertion('array_key_exists', 'Warning', 'Fail', 'simpletest.test', 'SimpleTestFunctionalTest->stubTest()'); $this->test_ids[] = $test_id = $this->getTestIdFromResults(); $this->assertTrue($test_id, t('Found test ID in results.')); -- cgit v1.2.3