Update master

This commit is contained in:
Karl Johan Kleist 2012-07-18 06:58:17 +03:00
parent c231794940
commit 53ec8e52ea

View File

@ -476,7 +476,7 @@ class TestCommentsViewlet(unittest.TestCase):
*time.gmtime(time.mktime(python_time.timetuple()))[:7]) *time.gmtime(time.mktime(python_time.timetuple()))[:7])
localized_time = self.viewlet.format_time(python_time) localized_time = self.viewlet.format_time(python_time)
# trying to get rid of this failure: # trying to get rid of this failure:
# https://jenkins.plone.org/job/plone-4.3-tests/lastFailedBuild/testReport/junit/plone.app.discussion.tests.test_comments_viewlet/TestCommentsViewlet/test_format_time/ # https://jenkins.plone.org/job/plone-4.3-tests/165/testReport/junit/plone.app.discussion.tests.test_comments_viewlet/TestCommentsViewlet/test_format_time/
# ... (but suspecting that now "plone-4.3-ecosystem" will fail, do they use different language settings?) # ... (but suspecting that now "plone-4.3-ecosystem" will fail, do they use different language settings?)
# self.assertEqual(localized_time, 'Feb 01, 2009 11:32 PM') # self.assertEqual(localized_time, 'Feb 01, 2009 11:32 PM')
# #