From d854b87af072314f30797e0eb8e0469252b71af1 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Wed, 6 Apr 2016 00:23:17 +0200
Subject: [PATCH] MDL-52502 behat: clean 2 uses of method and fix upgrade.txt
 version

---
 lib/tests/behat/behat_hooks.php | 4 ++--
 lib/upgrade.txt                 | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/tests/behat/behat_hooks.php b/lib/tests/behat/behat_hooks.php
index 03e7ef1e7b9..f06a1bdaa3b 100644
--- a/lib/tests/behat/behat_hooks.php
+++ b/lib/tests/behat/behat_hooks.php
@@ -133,7 +133,7 @@ class behat_hooks extends behat_base {
             throw new Exception('Behat only can run if test mode is enabled. More info in ' . behat_command::DOCS_URL . '#Running_tests');
         }
 
-        // Reset all data, before checking for is_server_running.
+        // Reset all data, before checking for check_server_status.
         // If not done, then it can return apache error, while running tests.
         behat_util::reset_all_data();
 
@@ -240,7 +240,7 @@ class behat_hooks extends behat_base {
             $session = $this->getSession();
         } catch (CurlExec $e) {
             // Exception thrown by WebDriver, so only @javascript tests will be caugth; in
-            // behat_util::is_server_running() we already checked that the server is running.
+            // behat_util::check_server_status() we already checked that the server is running.
             throw new Exception($driverexceptionmsg);
         } catch (DriverException $e) {
             throw new Exception($driverexceptionmsg);
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index e2c2a0db212..912959fb2bd 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 3.0.4 ===
+
+* behat_util::is_server_running() is removed, please use behat_util::check_server_status() instead.
+
 === 3.0.3 ===
 
 * The core_user::fill_properties_cache() static method has been introduced to be a reference
@@ -8,7 +12,6 @@ information provided here is intended especially for developers.
   checking it against the parameter (PARAM_*) type of the target user field. MDL-52781 is
   going to add support to null/not null and choices validation, replacing the existing code to
   validate the user fields in different places in a common way.
-* behat_util::is_server_running() is removed, please use behat_util::check_server_status() instead.
 
 === 3.0.1 ===
 
-- 
2.11.4.GIT