Merge branch 'MDL-81457-403' of https://github.com/andrewnicols/moodle into MOODLE_403_STABLE

enrol/tests/externallib_test.php

@@ -328,8 +328,9 @@ class externallib_test extends externallib_advanced_testcase {
                 $this->expectExceptionMessage($exception['message']);
             } else {
                 // Failed, only canview and exception are supported.
-                $this->markTestIncomplete('Incomplete, only canview and exception are supported');
+                throw new \coding_exception('Incomplete, only canview and exception are supported');
             }
+
             // Switch to the user and assign the role.
             $this->setUser(${$user});
             role_assign($roleid, $USER->id, $coursecontext);

lib/dml/tests/mysqli_native_moodle_database_test.php

@@ -123,7 +123,8 @@ class mysqli_native_moodle_database_test extends \advanced_testcase {
         } catch (moodle_exception $e) {
             // ... or fail.
             // Unfortunately we cannot be sure with the error string.
-            $this->markTestIncomplete('SSL not supported?');
+            $this->markTestSkipped('MySQL server does not support SSL. Unable to complete the test.');
+            return;
         }
 
         try {

lib/dml/tests/pgsql_native_moodle_database_test.php

@@ -411,7 +411,8 @@ class pgsql_native_moodle_database_test extends \advanced_testcase {
             // ... or fail with SSL not supported.
             $this->assertStringContainsString($pgconnerr, $e->debuginfo);
             $this->assertStringContainsString('server does not support SSL', $e->debuginfo);
-            $this->markTestIncomplete('SSL not supported.');
+            $this->markTestSkipped('Postgres server does not support SSL. Unable to complete the test.');
+            return;
         }
 
         try {