Launchpad itself

Merge lp:~thumper/launchpad/move-mocklogger into lp:launchpad

  1. move-mocklogger
  2. Merge into devel
Proposed by Tim Penhey
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 11120
Proposed branch: lp:~thumper/launchpad/move-mocklogger
Merge into: lp:launchpad
Diff against target: 149 lines (+11/-12)
10 files modified
lib/lp/code/model/tests/test_revision.py (+1/-1)
lib/lp/code/model/tests/test_revisionauthor.py (+1/-1)
lib/lp/code/scripts/tests/test_revisionkarma.py (+2/-2)
lib/lp/hardwaredb/doc/hwdb.txt (+1/-1)
lib/lp/registry/doc/standing.txt (+1/-1)
lib/lp/soyuz/doc/soyuz-set-of-uploads.txt (+1/-1)
lib/lp/testing/logger.py (+1/-2)
lib/lp/testing/tests/test_mocklogger.py (+1/-1)
lib/lp/translations/doc/poexport-request-productseries.txt (+1/-1)
lib/lp/translations/doc/poimport.txt (+1/-1)
To merge this branch: bzr merge lp:~thumper/launchpad/move-mocklogger
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+29698@code.launchpad.net

Commit message

Move MockLogger from canonical.launchpad.ftests.logger to lp.testing.logger.

Description of the change

A simple change to move code out of canonical.launchpad.ftests.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

I don't actually see the move. Otherwise it's good.

Revision history for this message
Tim Penhey (thumper) wrote :

On Mon, 12 Jul 2010 16:27:44 you wrote:
> I don't actually see the move. Otherwise it's good.

It is there in the diff, but you have to look hard.

Line 97 and 112 of the diff.

Revision history for this message
Jonathan Lange (jml) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/model/tests/test_revision.py'
2--- lib/lp/code/model/tests/test_revision.py 2010-04-16 15:06:55 +0000
3+++ lib/lp/code/model/tests/test_revision.py 2010-07-12 13:19:43 +0000
4@@ -18,7 +18,6 @@
5
6 from canonical.database.sqlbase import cursor
7 from canonical.launchpad.ftests import login, logout
8-from canonical.launchpad.ftests.logger import MockLogger
9 from canonical.launchpad.interfaces.lpstorm import IMasterObject
10 from canonical.launchpad.interfaces.account import AccountStatus
11 from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker
12@@ -33,6 +32,7 @@
13 from lp.registry.model.karma import Karma
14 from lp.testing import TestCaseWithFactory, time_counter
15 from lp.testing.factory import LaunchpadObjectFactory
16+from lp.testing.logger import MockLogger
17
18
19 class TestRevisionCreationDate(TestCaseWithFactory):
20
21=== modified file 'lib/lp/code/model/tests/test_revisionauthor.py'
22--- lib/lp/code/model/tests/test_revisionauthor.py 2010-01-07 06:40:23 +0000
23+++ lib/lp/code/model/tests/test_revisionauthor.py 2010-07-12 13:19:43 +0000
24@@ -12,10 +12,10 @@
25
26 from canonical.config import config
27 from canonical.launchpad.interfaces.emailaddress import EmailAddressStatus
28-from canonical.launchpad.ftests.logger import MockLogger
29 from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker
30 from lp.testing import TestCase
31 from lp.testing.factory import LaunchpadObjectFactory
32+from lp.testing.logger import MockLogger
33 from canonical.testing import LaunchpadZopelessLayer
34 from lp.code.model.revision import RevisionAuthor, RevisionSet
35 from lp.registry.interfaces.person import IPersonSet
36
37=== modified file 'lib/lp/code/scripts/tests/test_revisionkarma.py'
38--- lib/lp/code/scripts/tests/test_revisionkarma.py 2009-08-04 00:41:49 +0000
39+++ lib/lp/code/scripts/tests/test_revisionkarma.py 2010-07-12 13:19:43 +0000
40@@ -11,14 +11,14 @@
41
42 from canonical.config import config
43 from canonical.launchpad.database.emailaddress import EmailAddressSet
44-from canonical.launchpad.ftests.logger import MockLogger
45 from canonical.launchpad.scripts.garbo import RevisionAuthorEmailLinker
46-from lp.testing import TestCaseWithFactory
47 from canonical.testing import LaunchpadZopelessLayer
48
49 from lp.code.model.revision import RevisionSet
50 from lp.code.scripts.revisionkarma import RevisionKarmaAllocator
51 from lp.registry.model.karma import Karma
52+from lp.testing import TestCaseWithFactory
53+from lp.testing.logger import MockLogger
54
55
56 class TestRevisionKarma(TestCaseWithFactory):
57
58=== modified file 'lib/lp/hardwaredb/doc/hwdb.txt'
59--- lib/lp/hardwaredb/doc/hwdb.txt 2010-02-02 17:12:29 +0000
60+++ lib/lp/hardwaredb/doc/hwdb.txt 2010-07-12 13:19:43 +0000
61@@ -376,7 +376,7 @@
62 >>> user.validateAndEnsurePreferredEmail(email)
63 >>> transaction.commit()
64 >>> from canonical.launchpad.scripts.garbo import HWSubmissionEmailLinker
65- >>> from canonical.launchpad.ftests.logger import MockLogger
66+ >>> from lp.testing.logger import MockLogger
67 >>> HWSubmissionEmailLinker(log=MockLogger()).run()
68 >>> submission = hw_submission_set.getBySubmissionKey(u'unique-id-2')
69 >>> print submission.owner.displayname
70
71=== modified file 'lib/lp/registry/doc/standing.txt'
72--- lib/lp/registry/doc/standing.txt 2010-04-01 03:30:30 +0000
73+++ lib/lp/registry/doc/standing.txt 2010-07-12 13:19:43 +0000
74@@ -56,7 +56,7 @@
75 ... UpdatePersonalStanding)
76 >>> from canonical.config import config
77 >>> from canonical.testing import LaunchpadZopelessLayer
78- >>> from canonical.launchpad.ftests.logger import MockLogger
79+ >>> from lp.testing.logger import MockLogger
80 >>> class TestableScript(UpdatePersonalStanding):
81 ... """A testable version of `UpdatePersonalStanding`."""
82 ... def main(self):
83
84=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
85--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2010-05-21 12:39:44 +0000
86+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2010-07-12 13:19:43 +0000
87@@ -113,7 +113,7 @@
88
89 >>> import logging
90 >>> from canonical.config import config
91- >>> from canonical.launchpad.ftests.logger import MockLogger
92+ >>> from lp.testing.logger import MockLogger
93 >>> from lp.soyuz.scripts.soyuz_process_upload import (
94 ... ProcessUpload)
95 >>> from canonical.testing import LaunchpadZopelessLayer
96
97=== renamed file 'lib/canonical/launchpad/ftests/logger.py' => 'lib/lp/testing/logger.py'
98--- lib/canonical/launchpad/ftests/logger.py 2009-08-31 08:09:48 +0000
99+++ lib/lp/testing/logger.py 2010-07-12 13:19:43 +0000
100@@ -1,4 +1,4 @@
101-# Copyright 2009 Canonical Ltd. This software is licensed under the
102+# Copyright 2009, 2010 Canonical Ltd. This software is licensed under the
103 # GNU Affero General Public License version 3 (see the file LICENSE).
104
105 """Frequently-used logging utilities for test suite."""
106@@ -63,4 +63,3 @@
107
108 def exception(self, *args):
109 self.log(*args, **{'exc_info': True})
110-
111
112=== renamed file 'lib/canonical/launchpad/ftests/test_mocklogger.py' => 'lib/lp/testing/tests/test_mocklogger.py'
113--- lib/canonical/launchpad/ftests/test_mocklogger.py 2009-08-31 08:39:09 +0000
114+++ lib/lp/testing/tests/test_mocklogger.py 2010-07-12 13:19:43 +0000
115@@ -9,7 +9,7 @@
116 import unittest
117 from cStringIO import StringIO
118
119-from canonical.launchpad.ftests.logger import MockLogger
120+from lp.testing.logger import MockLogger
121
122
123 class TestMockLogger(unittest.TestCase):
124
125=== modified file 'lib/lp/translations/doc/poexport-request-productseries.txt'
126--- lib/lp/translations/doc/poexport-request-productseries.txt 2010-04-26 16:00:31 +0000
127+++ lib/lp/translations/doc/poexport-request-productseries.txt 2010-07-12 13:19:43 +0000
128@@ -7,7 +7,7 @@
129
130 This is a dummy logger class to capture the export's log messages.
131
132- >>> from canonical.launchpad.ftests.logger import MockLogger
133+ >>> from lp.testing.logger import MockLogger
134 >>> from lp.registry.model.person import Person
135 >>> person = Person.selectOneBy(name='name12')
136
137
138=== modified file 'lib/lp/translations/doc/poimport.txt'
139--- lib/lp/translations/doc/poimport.txt 2010-02-19 16:54:42 +0000
140+++ lib/lp/translations/doc/poimport.txt 2010-07-12 13:19:43 +0000
141@@ -681,7 +681,7 @@
142 two hand-approved Welsh translations that have just been imported.
143
144 >>> import logging
145- >>> from canonical.launchpad.ftests.logger import MockLogger
146+ >>> from lp.testing.logger import MockLogger
147 >>> process = ImportQueueGardener('approver', test_args=[])
148 >>> process.logger = MockLogger()
149 >>> process.logger.setLevel(logging.INFO)