Launchpad itself

Merge ~cjwatson/launchpad:fix-git-doctest into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-git-doctest
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: e34a3a48044c5d1f6eb13f22c9c00bd4524ce568
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-git-doctest
Merge into: launchpad:master
Diff against target: 12 lines (+1/-0)
1 file modified
lib/lp/services/mail/tests/test_stub.py (+1/-0)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+373568@code.launchpad.net

Commit message

Fix test_simple_sendmail harder for git

Wrapping the expected output requires the NORMALIZE_WHITESPACE doctest
directive.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving trivial test fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/services/mail/tests/test_stub.py b/lib/lp/services/mail/tests/test_stub.py
2index 032e7ed..095af90 100644
3--- a/lib/lp/services/mail/tests/test_stub.py
4+++ b/lib/lp/services/mail/tests/test_stub.py
5@@ -104,6 +104,7 @@ def test_simple_sendmail():
6 shows the git revision and instance name.
7
8 >>> message.get_params(header='X-Generated-By')
9+ ... # doctest: +NORMALIZE_WHITESPACE
10 [('Launchpad (canonical.com)', ''),
11 ('revision', '0000000000000000000000000000000000000000'),
12 ('instance', 'launchpad-lazr.conf')]

Subscribers

People subscribed via source and target branches

to status/vote changes: