← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:py3-testing-exception-modules into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:py3-testing-exception-modules into launchpad:master.

Commit message:
lp.testing: Use IGNORE_EXCEPTION_MODULE_IN_PYTHON2

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/397322

This allows doctests that test tracebacks to work on both Python 2 and 3.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-testing-exception-modules into launchpad:master.
diff --git a/lib/lp/testing/doc/pagetest-helpers.txt b/lib/lp/testing/doc/pagetest-helpers.txt
index 25684c4..1ebdeef 100644
--- a/lib/lp/testing/doc/pagetest-helpers.txt
+++ b/lib/lp/testing/doc/pagetest-helpers.txt
@@ -132,9 +132,10 @@ exception.
     ... </body>
     ... '''
     >>> find_tag_by_id(duplicate_id_content, 'duplicate')
+    ... # doctest: +IGNORE_EXCEPTION_MODULE_IN_PYTHON2
     Traceback (most recent call last):
     ...
-    DuplicateIdError: Found 2 elements with id 'duplicate'
+    lp.testing.pages.DuplicateIdError: Found 2 elements with id 'duplicate'
 
 A BeautifulSoup PageElement can be passed instead of a string so that
 content can be retrieved without reparsing the entire page.