ProofreadPage\Page\PageSlotDiffRendererTest::testGetDiff test failures are preventing all merges. Examples: https://gerrit.wikimedia.org/r/c/mediawiki/core/+/712968 https://gerrit.wikimedia.org/r/c/mediawiki/extensions/TemplateData/+/715304 https://gerrit.wikimedia.org/r/c/mediawiki/extensions/VisualEditor/+/726865
22:49:52 There were 2 failures: 22:49:52 22:49:52 1) ProofreadPage\Page\PageSlotDiffRendererTest::testGetDiff with data set #1 (null, ProofreadPage\Page\PageContent Object (...), 'Page statusPage status-Not pr...ooter ') 22:49:52 Failed asserting that two strings are identical. 22:49:52 --- Expected 22:49:52 +++ Actual 22:49:52 @@ @@ 22:49:52 -'Page statusPage status-Not proofread+ProblematicHeader (noinclude):Header (noinclude): + header Page body (to be transcluded):Page body (to be transcluded): + body2 Footer (noinclude):Footer (noinclude): + footer ' 22:49:52 +'Page statusPage status-Not proofread+ProblematicHeader (noinclude):Header (noinclude): header Page body (to be transcluded):Page body (to be transcluded): body2 Footer (noinclude):Footer (noinclude): footer ' 22:49:52 22:49:52 /workspace/src/extensions/ProofreadPage/tests/phpunit/Page/PageSlotDiffRendererTest.php:52 22:49:52 /workspace/src/tests/phpunit/MediaWikiIntegrationTestCase.php:452 ... 22:49:52 22:49:52 2) ProofreadPage\Page\PageSlotDiffRendererTest::testGetDiff with data set #2 (ProofreadPage\Page\PageContent Object (...), null, 'Page statusPage status-Proble...ooter ') 22:49:52 Failed asserting that two strings are identical. 22:49:52 --- Expected 22:49:52 +++ Actual 22:49:52 @@ @@ 22:49:52 -'Page statusPage status-Problematic+Not proofreadHeader (noinclude):Header (noinclude): - header Page body (to be transcluded):Page body (to be transcluded): - body Footer (noinclude):Footer (noinclude): - footer ' 22:49:52 +'Page statusPage status-Problematic+Not proofreadHeader (noinclude):Header (noinclude): header Page body (to be transcluded):Page body (to be transcluded): body Footer (noinclude):Footer (noinclude): footer ' 22:49:52 22:49:52 /workspace/src/extensions/ProofreadPage/tests/phpunit/Page/PageSlotDiffRendererTest.php:52 22:49:52 /workspace/src/tests/phpunit/MediaWikiIntegrationTestCase.php:452