# HG changeset patch # User fschwarz # Date 1299320579 0 # Node ID e4d08b21c49b3281f6dc170bebcf053055330a12 # Parent 5dc1835664dc7bd34260c21b48fe17e3606059b5 fix expected output from !FormatTimedeltaTestCase in babel.tests.dates and ensure it will be executed during the normal test run (see #259) diff --git a/babel/tests/dates.py b/babel/tests/dates.py --- a/babel/tests/dates.py +++ b/babel/tests/dates.py @@ -11,7 +11,7 @@ # individuals. For the exact contribution history, see the revision # history and logs, available at http://babel.edgewall.org/log/. -from datetime import date, datetime, time +from datetime import date, datetime, time, timedelta import doctest import new import unittest @@ -253,15 +253,15 @@ def test_zero_seconds(self): string = dates.format_timedelta(timedelta(seconds=0), locale='en') - self.assertEqual('0 seconds', string) + self.assertEqual('0 secs', string) string = dates.format_timedelta(timedelta(seconds=0), granularity='hour', locale='en') - self.assertEqual('0 hours', string) + self.assertEqual('0 hrs', string) def test_small_value_with_granularity(self): string = dates.format_timedelta(timedelta(seconds=42), granularity='hour', locale='en') - self.assertEqual('1 hour', string) + self.assertEqual('1 hr', string) class TimeZoneAdjustTestCase(unittest.TestCase): @@ -288,6 +288,7 @@ suite.addTest(unittest.makeSuite(DateTimeFormatTestCase)) suite.addTest(unittest.makeSuite(FormatDateTestCase)) suite.addTest(unittest.makeSuite(FormatTimeTestCase)) + suite.addTest(unittest.makeSuite(FormatTimedeltaTestCase)) suite.addTest(unittest.makeSuite(TimeZoneAdjustTestCase)) return suite