MDL-9866 incorrect include() in simpletest library

diff --git a/lib/simpletestlib/readme_moodle.txt b/lib/simpletestlib/readme_moodle.txt
new file mode 100644 (file)
index 0000000..061f2f1
--- /dev/null
+++ b/lib/simpletestlib/readme_moodle.txt
@@ -0,0 +1,8 @@
+Description of Simpletest 1.0.1beta library import into Moodle
+
+Changes:
+ * test_case.php - include() changed to include_once() in _requireWithError() MDL-9866
+
+skodak
+
+$Id$

diff --git a/lib/simpletestlib/test_case.php b/lib/simpletestlib/test_case.php
index 62d03493b4e99ab84315e006c58dbc35e8640d62..2d20504c1f2c8d5cd7a891bb7ac9fe425b59ffac 100644 (file)
--- a/lib/simpletestlib/test_case.php
+++ b/lib/simpletestlib/test_case.php
@@ -458,7 +458,7 @@
          */
         function _requireWithError($file) {
             $this->_enableErrorReporting();
-            include($file);
+            include_once($file); // moodle change - include prevents inheritance of test classes MDL-9866
             $error = isset($php_errormsg) ? $php_errormsg : false;
             $this->_disableErrorReporting();
             $self_inflicted_errors = array(