jenkins-bot has submitted this change and it was merged.
Change subject: Fix check for function wddx_deserialize in tests for hhvm
......................................................................
Fix check for function wddx_deserialize in tests for hhvm
The @requires just works for other tests, not for php functions.
This fixed a failure for the hhvm test server:
1) ApiFormatWddxTest::testValidSyntax
Failed asserting that null is of type "array".
Change-Id: Iadd8238ce62d4803cdf56508886ad016f8ac8f1d
---
M tests/phpunit/includes/api/format/ApiFormatWddxTest.php
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/api/format/ApiFormatWddxTest.php
b/tests/phpunit/includes/api/format/ApiFormatWddxTest.php
index d075f54..5170856 100644
--- a/tests/phpunit/includes/api/format/ApiFormatWddxTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatWddxTest.php
@@ -8,10 +8,11 @@
*/
class ApiFormatWddxTest extends ApiFormatTestBase {
- /**
- * @requires function wddx_deserialize
- */
public function testValidSyntax( ) {
+ if ( !function_exists( 'wddx_deserialize' ) ) {
+ $this->markTestSkipped( "Function 'wddx_deserialize'
not exist, skipping." );
+ }
+
$data = $this->apiRequest( 'wddx', array( 'action' => 'query',
'meta' => 'siteinfo' ) );
$this->assertInternalType( 'array', wddx_deserialize( $data ) );
--
To view, visit https://gerrit.wikimedia.org/r/178912
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iadd8238ce62d4803cdf56508886ad016f8ac8f1d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
