← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/testfix-pytz-2014.10 into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/testfix-pytz-2014.10 into lp:launchpad.

Commit message:
Fix tests for pytz 2014.10.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/testfix-pytz-2014.10/+merge/245547

Fix tests for pytz 2014.10.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/testfix-pytz-2014.10 into lp:launchpad.
=== modified file 'lib/lp/app/doc/tales.txt'
--- lib/lp/app/doc/tales.txt	2014-07-24 09:37:03 +0000
+++ lib/lp/app/doc/tales.txt	2015-01-05 08:12:56 +0000
@@ -483,7 +483,7 @@
     u'Australia/Perth'
 
     >>> test_tales("person/fmt:local-time", person=sample_person)
-    '... WST'
+    '... AWST'
 
     >>> print mark.time_zone
     None

=== modified file 'lib/lp/blueprints/stories/sprints/xx-sprints.txt'
--- lib/lp/blueprints/stories/sprints/xx-sprints.txt	2014-11-27 07:53:12 +0000
+++ lib/lp/blueprints/stories/sprints/xx-sprints.txt	2015-01-05 08:12:56 +0000
@@ -247,8 +247,8 @@
     http://launchpad.dev/sprints/ubz
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'start-end'))
-    Starts: 08:30 CST on Tuesday, 2006-01-10
-    Ends: 17:00 CST on Sunday, 2006-02-12
+    Starts: 08:30 ACST on Tuesday, 2006-01-10
+    Ends: 17:00 ACST on Sunday, 2006-02-12
 
 
 We should be able to see the workload of a sprint:

=== modified file 'lib/lp/bugs/doc/bugnotification-email.txt'
--- lib/lp/bugs/doc/bugnotification-email.txt	2012-12-26 01:32:19 +0000
+++ lib/lp/bugs/doc/bugnotification-email.txt	2015-01-05 08:12:56 +0000
@@ -541,8 +541,8 @@
     >>> import pytz
 
     >>> from_address = get_bugmail_from_address(lp_janitor, bug_four)
-    >>> sending_date = datetime(
-    ...     2008, 5, 20, 10, 5, 47, tzinfo=pytz.timezone('Europe/Prague'))
+    >>> sending_date = pytz.timezone('Europe/Prague').localize(
+    ...     datetime(2008, 5, 20, 11, 5, 47))
 
     >>> notification_email = bug_four_notification_builder.build(
     ...     from_address, 'foo.bar@xxxxxxxxxxxxx',

=== modified file 'lib/lp/code/stories/branches/xx-branch-listings.txt'
--- lib/lp/code/stories/branches/xx-branch-listings.txt	2014-12-06 10:45:17 +0000
+++ lib/lp/code/stories/branches/xx-branch-listings.txt	2015-01-05 08:12:56 +0000
@@ -480,11 +480,11 @@
     >>> for commit in find_tags_by_class(browser.contents, 'popupTitle'):
     ...     print extract_text(commit)
     Author: mark.shuttleworth
-    Revision Date: 2005-03-09 23:45:00 WST
+    Revision Date: 2005-03-09 23:45:00 AWST
     Import of Mozilla Firefox 0.9.1
     Author: mark.shuttleworth
-    Revision Date: 2005-03-09 23:50:00 WST
+    Revision Date: 2005-03-09 23:50:00 AWST
     Import of Mozilla Firefox 0.9
     Author: mark.shuttleworth
-    Revision Date: 2005-03-09 23:40:00 WST
+    Revision Date: 2005-03-09 23:40:00 AWST
     Import of Mozilla Firefox 0.9.2


Follow ups