Launchpad itself

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

  1. testfix-pytz-2014.10
  2. Merge into devel
Proposed by Colin Watson on 2015-01-05
Status: Merged
Approved by: Colin Watson on 2015-01-05
Approved revision: no longer in the source branch.
Merged at revision: 17290
Proposed branch: lp:~cjwatson/launchpad/testfix-pytz-2014.10
Merge into: lp:launchpad
Diff against target: 61 lines (+8/-8)
4 files modified
lib/lp/app/doc/tales.txt (+1/-1)
lib/lp/blueprints/stories/sprints/xx-sprints.txt (+2/-2)
lib/lp/bugs/doc/bugnotification-email.txt (+2/-2)
lib/lp/code/stories/branches/xx-branch-listings.txt (+3/-3)
To merge this branch: bzr merge lp:~cjwatson/launchpad/testfix-pytz-2014.10
Reviewer Review Type Date Requested Status
William Grant code 2015-01-05 Approve on 2015-01-05
Review via email: mp+245547@code.launchpad.net

Commit Message

Fix tests for pytz 2014.10.

Description of the Change

Fix tests for pytz 2014.10.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/app/doc/tales.txt'
2--- lib/lp/app/doc/tales.txt 2014-07-24 09:37:03 +0000
3+++ lib/lp/app/doc/tales.txt 2015-01-05 08:12:56 +0000
4@@ -483,7 +483,7 @@
5 u'Australia/Perth'
6
7 >>> test_tales("person/fmt:local-time", person=sample_person)
8- '... WST'
9+ '... AWST'
10
11 >>> print mark.time_zone
12 None
13
14=== modified file 'lib/lp/blueprints/stories/sprints/xx-sprints.txt'
15--- lib/lp/blueprints/stories/sprints/xx-sprints.txt 2014-11-27 07:53:12 +0000
16+++ lib/lp/blueprints/stories/sprints/xx-sprints.txt 2015-01-05 08:12:56 +0000
17@@ -247,8 +247,8 @@
18 http://launchpad.dev/sprints/ubz
19
20 >>> print extract_text(find_tag_by_id(browser.contents, 'start-end'))
21- Starts: 08:30 CST on Tuesday, 2006-01-10
22- Ends: 17:00 CST on Sunday, 2006-02-12
23+ Starts: 08:30 ACST on Tuesday, 2006-01-10
24+ Ends: 17:00 ACST on Sunday, 2006-02-12
25
26
27 We should be able to see the workload of a sprint:
28
29=== modified file 'lib/lp/bugs/doc/bugnotification-email.txt'
30--- lib/lp/bugs/doc/bugnotification-email.txt 2012-12-26 01:32:19 +0000
31+++ lib/lp/bugs/doc/bugnotification-email.txt 2015-01-05 08:12:56 +0000
32@@ -541,8 +541,8 @@
33 >>> import pytz
34
35 >>> from_address = get_bugmail_from_address(lp_janitor, bug_four)
36- >>> sending_date = datetime(
37- ... 2008, 5, 20, 10, 5, 47, tzinfo=pytz.timezone('Europe/Prague'))
38+ >>> sending_date = pytz.timezone('Europe/Prague').localize(
39+ ... datetime(2008, 5, 20, 11, 5, 47))
40
41 >>> notification_email = bug_four_notification_builder.build(
42 ... from_address, 'foo.bar@canonical.com',
43
44=== modified file 'lib/lp/code/stories/branches/xx-branch-listings.txt'
45--- lib/lp/code/stories/branches/xx-branch-listings.txt 2014-12-06 10:45:17 +0000
46+++ lib/lp/code/stories/branches/xx-branch-listings.txt 2015-01-05 08:12:56 +0000
47@@ -480,11 +480,11 @@
48 >>> for commit in find_tags_by_class(browser.contents, 'popupTitle'):
49 ... print extract_text(commit)
50 Author: mark.shuttleworth
51- Revision Date: 2005-03-09 23:45:00 WST
52+ Revision Date: 2005-03-09 23:45:00 AWST
53 Import of Mozilla Firefox 0.9.1
54 Author: mark.shuttleworth
55- Revision Date: 2005-03-09 23:50:00 WST
56+ Revision Date: 2005-03-09 23:50:00 AWST
57 Import of Mozilla Firefox 0.9
58 Author: mark.shuttleworth
59- Revision Date: 2005-03-09 23:40:00 WST
60+ Revision Date: 2005-03-09 23:40:00 AWST
61 Import of Mozilla Firefox 0.9.2