From 7a300a09f567b40033dc3a1e6c516f4493e54e5e Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 15 Jul 2025 09:23:17 +0800 Subject: [PATCH 1/2] MDL-86016 tests: Make install.xml test less restrictive --- lib/tests/db/plugin_checks_test.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/tests/db/plugin_checks_test.php b/lib/tests/db/plugin_checks_test.php index 90b2f2ce20f..12a4ac5be0e 100644 --- a/lib/tests/db/plugin_checks_test.php +++ b/lib/tests/db/plugin_checks_test.php @@ -52,7 +52,10 @@ final class plugin_checks_test extends \core\tests\plugin_checks_testcase { $xmldb = new \xmldb_file($file); $xmldb->loadXMLStructure(); $xmlcontents = $xmldb->getStructure()->xmlOutput(); - $this->assertSame($xmlcontents, $rawcontents, - "Unexpected install.xml format detected, reconciliation needed in $file"); + $this->assertXmlStringEqualsXmlString( + $rawcontents, + $xmlcontents, + "XMLDB structure does not match the install.xml file in $file", + ); } } From 41ead749cf308d71ad159b738f1e6f1f590e6fef Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 15 Jul 2025 09:31:51 +0800 Subject: [PATCH 2/2] MDL-86016 core: Remove xmldb test in favour of unit test --- .../xmldb/tests/behat/reconcile_xmldb_files.feature | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature diff --git a/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature b/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature deleted file mode 100644 index 6ebe74e4d23..00000000000 --- a/admin/tool/xmldb/tests/behat/reconcile_xmldb_files.feature +++ /dev/null @@ -1,12 +0,0 @@ -@tool @tool_xmldb -Feature: The Reconcile XMLDB files report works and all the files are ok - In order to ensure that all the XMLDB Editor xml files are generated properly - As a developer - I need to be able to run the Reconcile XMLDB files report and verify that everything is ok - - Scenario: The Reconcile XMLDB files reports that all files are ok - Given I log in as "admin" - And I navigate to "Development > XMLDB editor" in site administration - When I follow "[Reconcile XMLDB files]" - Then I should see "Look for XMLDB files needing reconciling" - And I should see "All files are OK. No reconciling is needed."