Merge branch 'MDL-70966-master' of git://github.com/marinaglancy/moodle

question/format/gift/tests/giftformat_test.php

@@ -729,7 +729,7 @@ class qformat_gift_test extends question_testcase {
                     'files' => array(),
                 ),
             ),
-            'tolerance' => array(2, 0),
+            'tolerance' => array(2, ''),
         );
 
         // Repeated test for better failure messages.

question/format/xml/tests/xmlformat_test.php

@@ -1132,7 +1132,7 @@ END;
                     'format' => FORMAT_HTML),
             array('text' => 'Completely wrong.',
                     'format' => FORMAT_HTML));
-        $expectedq->tolerance = array(0.001, 1, 0);
+        $expectedq->tolerance = array(0.001, 1, '');
 
         $this->assert(new question_check_specified_fields_expectation($expectedq), $q);
     }