Merge lp:~danilo/launchpad/bug-680044 into lp:launchpad

Proposed by Данило Шеган on 2010-12-13
Status: Merged
Approved by: Данило Шеган on 2010-12-13
Approved revision: no longer in the source branch.
Merged at revision: 12050
Proposed branch: lp:~danilo/launchpad/bug-680044
Merge into: lp:launchpad
Diff against target: 14 lines (+0/-4)
1 file modified
lib/lp/translations/tests/test_doc.py (+0/-4)
To merge this branch: bzr merge lp:~danilo/launchpad/bug-680044
Reviewer Review Type Date Requested Status
Henning Eggers (community) code 2010-12-13 Approve on 2010-12-13
Review via email: mp+43515@code.launchpad.net

Commit Message

[r=henninge][ui=none][bug=680044] Stop running pofile-views.txt twice.

Description of the Change

= Bug 680044 =

Test pofile-views.txt is run twice because it is run by the doc test suite and by the test_view.py in the containing directory. We need to remove the special case from the doc test suite since the view test uses appropriate layer anyway.

None of the other special-cased tests are affected since they all live in doc/* subdirectory which is what test_doc is processing anyway.

== Tests ==

bin/test -cvvt pofile-views.txt

To post a comment you must log in.
Henning Eggers (henninge) :
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/translations/tests/test_doc.py'
2--- lib/lp/translations/tests/test_doc.py 2010-10-18 16:36:46 +0000
3+++ lib/lp/translations/tests/test_doc.py 2010-12-13 13:53:54 +0000
4@@ -25,10 +25,6 @@
5
6
7 special = {
8- 'pofile-views.txt': LayeredDocFileSuite(
9- '../browser/tests/pofile-views.txt',
10- setUp=setUp, tearDown=tearDown, layer=LaunchpadFunctionalLayer
11- ),
12 'poexport-queue.txt': LayeredDocFileSuite(
13 '../doc/poexport-queue.txt',
14 setUp=setUp, tearDown=tearDown, layer=LaunchpadFunctionalLayer