From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 1 Dec 2017 22:44:37 +0000 (-0800)
Subject: Try to avoid bogus JobTest failures for PHP 7
X-Git-Tag: 1.31.0-rc.0~1316^2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=83bf5105d83e68e08f564d44f1a7209deeb99956;p=lhc%2Fweb%2Fwiklou.git

Try to avoid bogus JobTest failures for PHP 7

Change-Id: I07b4bd796a668fef83ebb3e2824ccc608781a6e8
---

diff --git a/tests/phpunit/includes/jobqueue/JobTest.php b/tests/phpunit/includes/jobqueue/JobTest.php
index 6723a0bf9b..e2aacae2f6 100644
--- a/tests/phpunit/includes/jobqueue/JobTest.php
+++ b/tests/phpunit/includes/jobqueue/JobTest.php
@@ -75,8 +75,10 @@ class JobTest extends MediaWikiTestCase {
 				'someCommand  pages={"932737":[0,"Robert_James_Waller"]} ' .
 				'rootJobSignature=45868e99bba89064e4483743ebb9b682ef95c1a7 ' .
 				'rootJobTimestamp=20160309110158 masterPos=' .
-				'{"file":"db1023-bin.001288","pos":"308257743","asOfTime":1457521464.3814} ' .
-				'triggeredRecursive=1 ' .
+				'{"file":"db1023-bin.001288","pos":"308257743","asOfTime":' .
+				// Embed dynamically because TestSetup sets serialize_precision=17
+				// which, in PHP 7.1 and 7.2, produces 1457521464.3814001 instead
+				json_encode( 1457521464.3814 ) . '} ' . 'triggeredRecursive=1 ' .
 				$requestId
 			],
 		];