From: Martin Kletzander <mkletzan(a)redhat.com>
This partially reverts commit 3caa28dc50df which changed the DST times
to start at Jan 2 due to an issue that is already solved in GLib that we
require for almost a year now.
This also fixes the test failures that would go away on Jan 2 11:00
UTC (less than two hours from writing this commit message) due to the
timezone definitions (the last failing test case has a timezone which is
UTC+11:00), but because of the change from '0/' to '1/' it did occur on
a day which is not caught by isNearYearEnd() which exists solely for
this purpose.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tests/virtimetest.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index 5972ce585ec9..62ff2faf35cf 100644
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -190,27 +190,20 @@ mymain(void)
/* test DST processing with timezones that always
* have DST in effect; what's more, cover a zone with
* with an unusual DST different than a usual one hour
- *
- * These tests originally used '0' as the first day,
- * but changed to '1' due to GLib GTimeZone parsing bug:
- * https://gitlab.gnome.org/GNOME/glib/issues/1999
- *
- * Once we depend on a new enough GLib (>= 2.63.4), we
- * can put them back to 0 again.
*/
- TEST_LOCALOFFSET("VIR-00:30VID,1/00:00:00,364/23:59:59",
+ TEST_LOCALOFFSET("VIR-00:30VID,0/00:00:00,364/23:59:59",
((1 * 60) + 30) * 60);
- TEST_LOCALOFFSET("VIR-02:30VID,1/00:00:00,364/23:59:59",
+ TEST_LOCALOFFSET("VIR-02:30VID,0/00:00:00,364/23:59:59",
((3 * 60) + 30) * 60);
- TEST_LOCALOFFSET("VIR-02:30VID-04:30,1/00:00:00,364/23:59:59",
+ TEST_LOCALOFFSET("VIR-02:30VID-04:30,0/00:00:00,364/23:59:59",
((4 * 60) + 30) * 60);
- TEST_LOCALOFFSET("VIR-12:00VID-13:00,1/00:00:00,364/23:59:59",
+ TEST_LOCALOFFSET("VIR-12:00VID-13:00,0/00:00:00,364/23:59:59",
((13 * 60) + 0) * 60);
- TEST_LOCALOFFSET("VIR02:45VID00:45,1/00:00:00,364/23:59:59",
+ TEST_LOCALOFFSET("VIR02:45VID00:45,0/00:00:00,364/23:59:59",
-45 * 60);
- TEST_LOCALOFFSET("VIR05:00VID04:00,1/00:00:00,364/23:59:59",
+ TEST_LOCALOFFSET("VIR05:00VID04:00,0/00:00:00,364/23:59:59",
((-4 * 60) + 0) * 60);
- TEST_LOCALOFFSET("VIR11:00VID10:00,1/00:00:00,364/23:59:59",
+ TEST_LOCALOFFSET("VIR11:00VID10:00,0/00:00:00,364/23:59:59",
((-10 * 60) + 0) * 60);
}
--
2.52.0
