------------------------------------------------------------------------
r11876 | jomae | 2013-07-28 03:53:59 +0200 (Sun, 28 Jul 2013) | 2 lines

1.0.2dev: fixed test failures due to differences of date/time formats between Babel 0.9.x (CLDR 1.6.x) and Babel 1.x (CLDR 23). (a part of #11258)


Index: trac/util/tests/datefmt.py
===================================================================
--- trac/util/tests/datefmt.py	(revision 11875)
+++ trac/util/tests/datefmt.py	(revision 11876)
@@ -734,9 +734,9 @@
             tz = datefmt.timezone('GMT +2:00')
             t = datetime.datetime(2010, 8, 28, 11, 45, 56, 123456, datefmt.utc)
             en_US = Locale.parse('en_US')
-            self.assertEqual('Aug 28, 2010 1:45:56 PM',
-                             datefmt.format_datetime(t, tzinfo=tz,
-                                                     locale=en_US))
+            self.assert_(datefmt.format_datetime(t, tzinfo=tz, locale=en_US)
+                         in ('Aug 28, 2010 1:45:56 PM',
+                             'Aug 28, 2010, 1:45:56 PM'))  # CLDR 23
             en_GB = Locale.parse('en_GB')
             self.assertEqual('28 Aug 2010 13:45:56',
                              datefmt.format_datetime(t, tzinfo=tz,
@@ -1022,8 +1022,9 @@
             en_US = Locale.parse('en_US')
 
             # Converting default format to babel's format
-            self.assertEqual('Aug 28, 2010 1:45:56 PM',
-                             datefmt.format_datetime(t, '%x %X', tz, en_US))
+            self.assert_(datefmt.format_datetime(t, '%x %X', tz, en_US)
+                         in ('Aug 28, 2010 1:45:56 PM',
+                             'Aug 28, 2010, 1:45:56 PM'))  # CLDR 23
             self.assertEqual('Aug 28, 2010',
                              datefmt.format_datetime(t, '%x', tz, en_US))
             self.assertEqual('1:45:56 PM',

------------------------------------------------------------------------