From dd215cb1a3188a67125907811e43280bcc64e8aa Mon Sep 17 00:00:00 2001
From: David Monllao <davidm@moodle.com>
Date: Mon, 2 May 2016 12:37:32 +0800
Subject: [PATCH] MDL-54008 timezone: Updating references to Caracas tz.

I've removed Caracas direct references because it would fail on
some systems, it would depend on how updated is the olson version
PHP is using.
---
 lib/classes/date.php                   | 1 -
 lib/tests/date_test.php                | 2 +-
 lib/tests/fixtures/timezonewindows.xml | 4 ++--
 lib/tests/scheduled_task_test.php      | 8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/classes/date.php b/lib/classes/date.php
index bdfec8dbb07..6026bb91e72 100644
--- a/lib/classes/date.php
+++ b/lib/classes/date.php
@@ -532,7 +532,6 @@ class core_date {
         }
 
         // Legacy Moodle half an hour offsets - pick any city nearby, ideally without DST.
-        self::$badzones['-4.5'] = 'America/Caracas';
         self::$badzones['4.5'] = 'Asia/Kabul';
         self::$badzones['5.5'] = 'Asia/Kolkata';
         self::$badzones['6.5'] = 'Asia/Rangoon';
diff --git a/lib/tests/date_test.php b/lib/tests/date_test.php
index dc0560b4561..3e4d908787e 100644
--- a/lib/tests/date_test.php
+++ b/lib/tests/date_test.php
@@ -67,6 +67,7 @@ class core_date_testcase extends advanced_testcase {
         $this->assertSame('Etc/GMT-2', core_date::normalise_timezone('2.0'));
         $this->assertSame('Etc/GMT+2', core_date::normalise_timezone(-2));
         $this->assertSame('Etc/GMT+2', core_date::normalise_timezone('-2.0'));
+        $this->assertSame('Etc/GMT+4', core_date::normalise_timezone(-4));
         $this->assertSame('Etc/GMT-2', core_date::normalise_timezone('UTC+2'));
         $this->assertSame('Etc/GMT+2', core_date::normalise_timezone('UTC-2'));
         $this->assertSame('Etc/GMT-2', core_date::normalise_timezone('GMT+2'));
@@ -78,7 +79,6 @@ class core_date_testcase extends advanced_testcase {
         $this->assertSame('Etc/GMT-13', core_date::normalise_timezone(13));
         $this->assertSame('Pacific/Auckland', core_date::normalise_timezone(14));
 
-        $this->assertSame('America/Caracas', core_date::normalise_timezone(-4.5));
         $this->assertSame('Asia/Kabul', core_date::normalise_timezone(4.5));
         $this->assertSame('Asia/Kolkata', core_date::normalise_timezone(5.5));
         $this->assertSame('Asia/Rangoon', core_date::normalise_timezone(6.5));
diff --git a/lib/tests/fixtures/timezonewindows.xml b/lib/tests/fixtures/timezonewindows.xml
index cae95f6599d..a2d4a3e7f01 100644
--- a/lib/tests/fixtures/timezonewindows.xml
+++ b/lib/tests/fixtures/timezonewindows.xml
@@ -116,7 +116,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="US Eastern Standard Time" territory="001" type="America/Indianapolis"/>
 			<mapZone other="US Eastern Standard Time" territory="US" type="America/Indianapolis America/Indiana/Marengo America/Indiana/Vevay"/>
 
-			<!-- (UTC-04:30) Caracas -->
+			<!-- (UTC-04:00) Caracas -->
 			<mapZone other="Venezuela Standard Time" territory="001" type="America/Caracas"/>
 			<mapZone other="Venezuela Standard Time" territory="VE" type="America/Caracas"/>
 
@@ -672,4 +672,4 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<mapZone other="Line Islands Standard Time" territory="ZZ" type="Etc/GMT-14"/>
 		</mapTimezones>
 	</windowsZones>
-</supplementalData>
\ No newline at end of file
+</supplementalData>
diff --git a/lib/tests/scheduled_task_test.php b/lib/tests/scheduled_task_test.php
index 7f3b150e49d..2dc039c2ba6 100644
--- a/lib/tests/scheduled_task_test.php
+++ b/lib/tests/scheduled_task_test.php
@@ -127,7 +127,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
         // The timezones used in this test are chosen because they do not use DST - that would break the test.
         $this->resetAfterTest();
 
-        $this->setTimezone('America/Caracas');
+        $this->setTimezone('Asia/Kabul');
 
         $testclass = new \core\task\scheduled_test_task();
 
@@ -143,9 +143,9 @@ class core_scheduled_task_testcase extends advanced_testcase {
         $userdate = userdate($nexttime);
 
         // Should be displayed in user timezone.
-        // I used http://www.timeanddate.com/worldclock/fixedtime.html?msg=Moodle+Test&iso=20140314T01&p1=58
-        // to verify this time.
-        $this->assertContains('11:15 AM', core_text::strtoupper($userdate));
+        // I used http://www.timeanddate.com/worldclock/fixedtime.html?msg=Moodle+Test&iso=20160502T01&p1=113
+        // setting my location to Kathmandu to verify this time.
+        $this->assertContains('2:15 AM', core_text::strtoupper($userdate));
     }
 
     public function test_reset_scheduled_tasks_for_component() {