090be3
From c5c60ded6dbb6256640b0308a45c42da8c7fe071 Mon Sep 17 00:00:00 2001
090be3
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
090be3
Date: Fri, 22 Apr 2016 12:20:06 +0000
090be3
Subject: [PATCH] * test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow
090be3
 removed   to avoid test failures due to the tzdata change.  
090be3
 https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95 
090be3
  Found by naruse.
090be3
090be3
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
090be3
---
090be3
 ChangeLog                 |  7 +++++++
090be3
 test/ruby/test_time_tz.rb | 13 -------------
090be3
 2 files changed, 7 insertions(+), 13 deletions(-)
090be3
090be3
diff --git a/ChangeLog b/ChangeLog
090be3
index 3b96a9b..965f296 100644
090be3
--- a/ChangeLog
090be3
+++ b/ChangeLog
090be3
@@ -1,3 +1,10 @@
090be3
+Fri Apr 22 21:00:44 2016  Tanaka Akira  <akr@fsij.org>
090be3
+
090be3
+  * test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed
090be3
+    to avoid test failures due to the tzdata change.
090be3
+    https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95
090be3
+    Found by naruse.
090be3
+
090be3
 Wed Dec 16 21:16:55 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
090be3
 
090be3
 	* ext/fiddle/handle.c: check tainted string arguments.
090be3
diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
090be3
index f5d4690..b40b1ac 100644
090be3
--- a/test/ruby/test_time_tz.rb
090be3
+++ b/test/ruby/test_time_tz.rb
090be3
@@ -161,13 +161,6 @@ def test_europe_lisbon
090be3
     }
090be3
   end if has_lisbon_tz
090be3
 
090be3
-  def test_europe_moscow
090be3
-    with_tz(tz="Europe/Moscow") {
090be3
-      assert_time_constructor(tz, "1992-03-29 00:00:00 +0400", :local, [1992,3,28,23,0,0])
090be3
-      assert_time_constructor(tz, "1992-03-29 00:59:59 +0400", :local, [1992,3,28,23,59,59])
090be3
-    }
090be3
-  end
090be3
-
090be3
   def test_pacific_kiritimati
090be3
     with_tz(tz="Pacific/Kiritimati") {
090be3
       assert_time_constructor(tz, "1994-12-31 23:59:59 -1000", :local, [1994,12,31,23,59,59])
090be3
@@ -346,12 +339,6 @@ def self.gen_zdump_test(data)
090be3
 Europe/London  Sun Aug 10 01:00:00 1947 UTC = Sun Aug 10 02:00:00 1947 BST isdst=1 gmtoff=3600
090be3
 Europe/London  Sun Nov  2 01:59:59 1947 UTC = Sun Nov  2 02:59:59 1947 BST isdst=1 gmtoff=3600
090be3
 Europe/London  Sun Nov  2 02:00:00 1947 UTC = Sun Nov  2 02:00:00 1947 GMT isdst=0 gmtoff=0
090be3
-Europe/Moscow  Sat Jan 18 23:59:59 1992 UTC = Sun Jan 19 01:59:59 1992 MSK isdst=0 gmtoff=7200
090be3
-Europe/Moscow  Sun Jan 19 00:00:00 1992 UTC = Sun Jan 19 03:00:00 1992 MSK isdst=0 gmtoff=10800
090be3
-Europe/Moscow  Sat Mar 28 19:59:59 1992 UTC = Sat Mar 28 22:59:59 1992 MSK isdst=0 gmtoff=10800
090be3
-Europe/Moscow  Sat Mar 28 20:00:00 1992 UTC = Sun Mar 29 00:00:00 1992 MSD isdst=1 gmtoff=14400
090be3
-Europe/Moscow  Sat Sep 26 18:59:59 1992 UTC = Sat Sep 26 22:59:59 1992 MSD isdst=1 gmtoff=14400
090be3
-Europe/Moscow  Sat Sep 26 19:00:00 1992 UTC = Sat Sep 26 22:00:00 1992 MSK isdst=0 gmtoff=10800
090be3
 Pacific/Kiritimati  Sun Jan  1 09:59:59 1995 UTC = Sat Dec 31 23:59:59 1994 LINT isdst=0 gmtoff=-36000
090be3
 Pacific/Kiritimati  Sun Jan  1 10:00:00 1995 UTC = Mon Jan  2 00:00:00 1995 LINT isdst=0 gmtoff=50400
090be3
 End