Merge lp:~cjwatson/launchpad/modern-testtools-cleanup into lp:launchpad

Proposed by Colin Watson on 2017-12-19
Status: Merged
Merged at revision: 18555
Proposed branch: lp:~cjwatson/launchpad/modern-testtools-cleanup
Merge into: lp:launchpad
Prerequisite: lp:~cjwatson/launchpad/upgrade-testtools
Diff against target: 515 lines (+50/-58)
30 files modified
lib/lp/archivepublisher/tests/test_archivesigningkey.py (+1/-1)
lib/lp/archivepublisher/tests/test_publishdistro.py (+1/-1)
lib/lp/archivepublisher/tests/test_publisher.py (+1/-1)
lib/lp/archivepublisher/tests/test_signing.py (+1/-1)
lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py (+1/-1)
lib/lp/buildmaster/tests/test_interactor.py (+6/-6)
lib/lp/buildmaster/tests/test_manager.py (+3/-3)
lib/lp/code/model/tests/test_recipebuilder.py (+1/-1)
lib/lp/codehosting/codeimport/tests/test_workermonitor.py (+1/-1)
lib/lp/codehosting/puller/tests/test_acceptance.py (+1/-2)
lib/lp/codehosting/puller/tests/test_scheduler.py (+1/-1)
lib/lp/codehosting/tests/helpers.py (+1/-1)
lib/lp/codehosting/tests/test_sftp.py (+1/-1)
lib/lp/codehosting/vfs/tests/test_branchfs.py (+1/-1)
lib/lp/codehosting/vfs/tests/test_branchfsclient.py (+1/-1)
lib/lp/registry/tests/test_teammembership.py (+3/-4)
lib/lp/services/apachelogparser/tests/test_apachelogparser.py (+2/-2)
lib/lp/services/config/tests/test_config.py (+9/-10)
lib/lp/services/log/logger.py (+3/-7)
lib/lp/services/tests/test_utils.py (+1/-2)
lib/lp/services/twistedsupport/tests/test_processmonitor.py (+1/-1)
lib/lp/services/twistedsupport/tests/test_twistedsupport.py (+1/-1)
lib/lp/snappy/tests/test_snapbuildbehaviour.py (+1/-1)
lib/lp/soyuz/adapters/tests/test_archivedependencies.py (+1/-1)
lib/lp/soyuz/tests/test_archive.py (+1/-1)
lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py (+1/-1)
lib/lp/soyuz/tests/test_livefsbuildbehaviour.py (+1/-1)
lib/lp/testing/keyserver/tests/test_inprocess.py (+1/-1)
lib/lp/testing/keyserver/tests/test_web.py (+1/-1)
lib/lp/translations/tests/test_translationtemplatesbuildbehaviour.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/modern-testtools-cleanup
Reviewer Review Type Date Requested Status
William Grant code 2017-12-19 Approve on 2018-01-30
Review via email: mp+335396@code.launchpad.net

Commit message

Take advantage of modern testtools/fixtures to simplify a few things.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)
18528. By Colin Watson on 2018-02-14

Merge devel.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/archivepublisher/tests/test_archivesigningkey.py'
2--- lib/lp/archivepublisher/tests/test_archivesigningkey.py 2017-04-29 15:24:32 +0000
3+++ lib/lp/archivepublisher/tests/test_archivesigningkey.py 2018-02-14 11:21:34 +0000
4@@ -7,7 +7,7 @@
5
6 import os
7
8-from testtools.deferredruntest import AsynchronousDeferredRunTest
9+from testtools.twistedsupport import AsynchronousDeferredRunTest
10 from twisted.internet import defer
11 from zope.component import getUtility
12
13
14=== modified file 'lib/lp/archivepublisher/tests/test_publishdistro.py'
15--- lib/lp/archivepublisher/tests/test_publishdistro.py 2017-04-29 15:24:32 +0000
16+++ lib/lp/archivepublisher/tests/test_publishdistro.py 2018-02-14 11:21:34 +0000
17@@ -11,11 +11,11 @@
18 import subprocess
19 import sys
20
21-from testtools.deferredruntest import AsynchronousDeferredRunTest
22 from testtools.matchers import (
23 Not,
24 PathExists,
25 )
26+from testtools.twistedsupport import AsynchronousDeferredRunTest
27 from twisted.internet import defer
28 from zope.component import getUtility
29 from zope.security.proxy import removeSecurityProxy
30
31=== modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
32--- lib/lp/archivepublisher/tests/test_publisher.py 2017-04-29 15:24:32 +0000
33+++ lib/lp/archivepublisher/tests/test_publisher.py 2018-02-14 11:21:34 +0000
34@@ -32,7 +32,6 @@
35 except ImportError:
36 from backports import lzma
37 import pytz
38-from testtools.deferredruntest import AsynchronousDeferredRunTest
39 from testtools.matchers import (
40 ContainsAll,
41 DirContains,
42@@ -49,6 +48,7 @@
43 PathExists,
44 SamePath,
45 )
46+from testtools.twistedsupport import AsynchronousDeferredRunTest
47 import transaction
48 from twisted.internet import defer
49 from zope.component import getUtility
50
51=== modified file 'lib/lp/archivepublisher/tests/test_signing.py'
52--- lib/lp/archivepublisher/tests/test_signing.py 2017-08-02 19:13:48 +0000
53+++ lib/lp/archivepublisher/tests/test_signing.py 2018-02-14 11:21:34 +0000
54@@ -10,7 +10,6 @@
55 import tarfile
56
57 from fixtures import MonkeyPatch
58-from testtools.deferredruntest import AsynchronousDeferredRunTest
59 from testtools.matchers import (
60 Contains,
61 Matcher,
62@@ -18,6 +17,7 @@
63 Mismatch,
64 Not,
65 )
66+from testtools.twistedsupport import AsynchronousDeferredRunTest
67 from twisted.internet import defer
68 from zope.component import getUtility
69
70
71=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py'
72--- lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py 2018-01-02 16:10:26 +0000
73+++ lib/lp/buildmaster/tests/test_buildfarmjobbehaviour.py 2018-02-14 11:21:34 +0000
74@@ -12,7 +12,7 @@
75 import tempfile
76
77 from testtools import ExpectedException
78-from testtools.deferredruntest import AsynchronousDeferredRunTest
79+from testtools.twistedsupport import AsynchronousDeferredRunTest
80 from twisted.internet import defer
81 from zope.component import getUtility
82 from zope.security.proxy import removeSecurityProxy
83
84=== modified file 'lib/lp/buildmaster/tests/test_interactor.py'
85--- lib/lp/buildmaster/tests/test_interactor.py 2017-09-13 08:05:35 +0000
86+++ lib/lp/buildmaster/tests/test_interactor.py 2018-02-14 11:21:34 +0000
87@@ -15,17 +15,17 @@
88
89 from lpbuildd.slave import BuilderStatus
90 from lpbuildd.tests.harness import BuilddSlaveTestSetup
91-from testtools.deferredruntest import (
92+from testtools.matchers import (
93+ ContainsAll,
94+ HasLength,
95+ MatchesDict,
96+ )
97+from testtools.twistedsupport import (
98 assert_fails_with,
99 AsynchronousDeferredRunTest,
100 AsynchronousDeferredRunTestForBrokenTwisted,
101 SynchronousDeferredRunTest,
102 )
103-from testtools.matchers import (
104- ContainsAll,
105- HasLength,
106- MatchesDict,
107- )
108 from testtools.testcase import ExpectedException
109 from twisted.internet import (
110 defer,
111
112=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
113--- lib/lp/buildmaster/tests/test_manager.py 2017-04-03 12:35:03 +0000
114+++ lib/lp/buildmaster/tests/test_manager.py 2018-02-14 11:21:34 +0000
115@@ -12,12 +12,12 @@
116 import time
117 import xmlrpclib
118
119-from testtools.deferredruntest import (
120+from testtools.matchers import Equals
121+from testtools.testcase import ExpectedException
122+from testtools.twistedsupport import (
123 assert_fails_with,
124 AsynchronousDeferredRunTest,
125 )
126-from testtools.matchers import Equals
127-from testtools.testcase import ExpectedException
128 import transaction
129 from twisted.internet import (
130 defer,
131
132=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
133--- lib/lp/code/model/tests/test_recipebuilder.py 2018-01-02 16:10:26 +0000
134+++ lib/lp/code/model/tests/test_recipebuilder.py 2018-02-14 11:21:34 +0000
135@@ -11,8 +11,8 @@
136 import shutil
137 import tempfile
138
139-from testtools.deferredruntest import AsynchronousDeferredRunTest
140 from testtools.matchers import MatchesListwise
141+from testtools.twistedsupport import AsynchronousDeferredRunTest
142 import transaction
143 from twisted.internet import defer
144 from twisted.trial.unittest import TestCase as TrialTestCase
145
146=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
147--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py 2017-09-02 13:29:14 +0000
148+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py 2018-02-14 11:21:34 +0000
149@@ -19,7 +19,7 @@
150 from bzrlib.tests import TestCaseInTempDir
151 from dulwich.repo import Repo as GitRepo
152 import oops_twisted
153-from testtools.deferredruntest import (
154+from testtools.twistedsupport import (
155 assert_fails_with,
156 AsynchronousDeferredRunTest,
157 flush_logged_errors,
158
159=== modified file 'lib/lp/codehosting/puller/tests/test_acceptance.py'
160--- lib/lp/codehosting/puller/tests/test_acceptance.py 2012-09-18 19:41:02 +0000
161+++ lib/lp/codehosting/puller/tests/test_acceptance.py 2018-02-14 11:21:34 +0000
162@@ -128,8 +128,7 @@
163 output and error are strings contain the output of the process to
164 stdout and stderr respectively.
165 """
166- tempdir = self.useFixture(TempDir()).path
167- logfile = os.path.join(tempdir, "supermirror_test.log")
168+ logfile = self.useFixture(TempDir()).join("supermirror_test.log")
169 command = [
170 '%s/bin/py' % config.root, self._puller_script, '--log-file',
171 logfile, '-q'] + list(args)
172
173=== modified file 'lib/lp/codehosting/puller/tests/test_scheduler.py'
174--- lib/lp/codehosting/puller/tests/test_scheduler.py 2018-01-26 13:47:51 +0000
175+++ lib/lp/codehosting/puller/tests/test_scheduler.py 2018-02-14 11:21:34 +0000
176@@ -13,7 +13,7 @@
177 format_registry,
178 )
179 from bzrlib.urlutils import join as urljoin
180-from testtools.deferredruntest import (
181+from testtools.twistedsupport import (
182 assert_fails_with,
183 AsynchronousDeferredRunTest,
184 flush_logged_errors,
185
186=== modified file 'lib/lp/codehosting/tests/helpers.py'
187--- lib/lp/codehosting/tests/helpers.py 2017-01-12 18:02:15 +0000
188+++ lib/lp/codehosting/tests/helpers.py 2018-02-14 11:21:34 +0000
189@@ -22,7 +22,7 @@
190 TestNotApplicable,
191 TestSkipped,
192 )
193-from testtools.deferredruntest import AsynchronousDeferredRunTest
194+from testtools.twistedsupport import AsynchronousDeferredRunTest
195
196 from lp.code.enums import BranchType
197 from lp.codehosting.vfs import branch_id_to_path
198
199=== modified file 'lib/lp/codehosting/tests/test_sftp.py'
200--- lib/lp/codehosting/tests/test_sftp.py 2016-02-05 16:51:12 +0000
201+++ lib/lp/codehosting/tests/test_sftp.py 2018-02-14 11:21:34 +0000
202@@ -14,7 +14,7 @@
203 from bzrlib.transport import get_transport
204 from bzrlib.transport.memory import MemoryTransport
205 from lazr.sshserver.sftp import FileIsADirectory
206-from testtools.deferredruntest import (
207+from testtools.twistedsupport import (
208 assert_fails_with,
209 AsynchronousDeferredRunTest,
210 )
211
212=== modified file 'lib/lp/codehosting/vfs/tests/test_branchfs.py'
213--- lib/lp/codehosting/vfs/tests/test_branchfs.py 2018-02-14 01:27:28 +0000
214+++ lib/lp/codehosting/vfs/tests/test_branchfs.py 2018-02-14 11:21:34 +0000
215@@ -38,7 +38,7 @@
216 escape,
217 local_path_to_url,
218 )
219-from testtools.deferredruntest import (
220+from testtools.twistedsupport import (
221 assert_fails_with,
222 AsynchronousDeferredRunTest,
223 )
224
225=== modified file 'lib/lp/codehosting/vfs/tests/test_branchfsclient.py'
226--- lib/lp/codehosting/vfs/tests/test_branchfsclient.py 2018-01-26 13:47:51 +0000
227+++ lib/lp/codehosting/vfs/tests/test_branchfsclient.py 2018-02-14 11:21:34 +0000
228@@ -5,7 +5,7 @@
229
230 __metaclass__ = type
231
232-from testtools.deferredruntest import AsynchronousDeferredRunTest
233+from testtools.twistedsupport import AsynchronousDeferredRunTest
234 from twisted.internet import defer
235
236 from lp.code.interfaces.codehosting import BRANCH_TRANSPORT
237
238=== modified file 'lib/lp/registry/tests/test_teammembership.py'
239--- lib/lp/registry/tests/test_teammembership.py 2018-02-02 10:06:24 +0000
240+++ lib/lp/registry/tests/test_teammembership.py 2018-02-14 11:21:34 +0000
241@@ -8,7 +8,6 @@
242 datetime,
243 timedelta,
244 )
245-import os
246 import pickle
247 import re
248 import subprocess
249@@ -1288,9 +1287,9 @@
250 logger = BufferLogger()
251 self.addDetail("log", logger.content)
252 info = fetch_team_participation_info(logger)
253- tempdir = self.useFixture(TempDir()).path
254- filename_in = os.path.join(tempdir, "info.in")
255- filename_out = os.path.join(tempdir, "info.out")
256+ tempdir = self.useFixture(TempDir())
257+ filename_in = tempdir.join("info.in")
258+ filename_out = tempdir.join("info.out")
259 fout = bz2.BZ2File(filename_in, "w")
260 try:
261 pickle.dump(info, fout, pickle.HIGHEST_PROTOCOL)
262
263=== modified file 'lib/lp/services/apachelogparser/tests/test_apachelogparser.py'
264--- lib/lp/services/apachelogparser/tests/test_apachelogparser.py 2018-01-02 10:54:31 +0000
265+++ lib/lp/services/apachelogparser/tests/test_apachelogparser.py 2018-02-14 11:21:34 +0000
266@@ -391,8 +391,8 @@
267
268 def test_sorts_by_mtime(self):
269 # Files are sorted by ascending mtime.
270- root = self.useFixture(TempDir()).path
271- file_paths = [os.path.join(root, str(name)) for name in range(3)]
272+ root = self.useFixture(TempDir())
273+ file_paths = [root.join(str(name)) for name in range(3)]
274 now = time.time()
275 for i, path in enumerate(file_paths):
276 write_file(path, '%s\n' % i)
277
278=== modified file 'lib/lp/services/config/tests/test_config.py'
279--- lib/lp/services/config/tests/test_config.py 2016-10-03 23:48:34 +0000
280+++ lib/lp/services/config/tests/test_config.py 2018-02-14 11:21:34 +0000
281@@ -95,20 +95,19 @@
282 # The launchpad.config_overlay_dir setting can be used to load
283 # extra config files over the top. This is useful for overlaying
284 # non-version-controlled secrets.
285- config_dir = self.useFixture(TempDir(rootdir='configs')).path
286- config_name = os.path.basename(config_dir)
287- overlay_dir = self.useFixture(TempDir(rootdir='configs')).path
288- with open(os.path.join(config_dir, 'launchpad-lazr.conf'), 'w') as f:
289+ config_dir = self.useFixture(TempDir(rootdir='configs'))
290+ config_name = os.path.basename(config_dir.path)
291+ overlay_dir = self.useFixture(TempDir(rootdir='configs'))
292+ with open(config_dir.join('launchpad-lazr.conf'), 'w') as f:
293 f.write("""
294 [meta]
295 extends: ../testrunner/launchpad-lazr.conf
296
297 [launchpad]
298 config_overlay_dir: ../%s
299- """ % os.path.basename(overlay_dir))
300+ """ % os.path.basename(overlay_dir.path))
301 os.symlink(
302- '../testrunner/launchpad.conf',
303- os.path.join(config_dir, 'launchpad.conf'))
304+ '../testrunner/launchpad.conf', config_dir.join('launchpad.conf'))
305
306 config = lp.services.config.config
307
308@@ -116,7 +115,7 @@
309 self.assertEqual('launchpad_main', config.launchpad.dbuser)
310 self.assertEqual('', config.launchpad.site_message)
311
312- with open(os.path.join(overlay_dir, '00-test-lazr.conf'), 'w') as f:
313+ with open(overlay_dir.join('00-test-lazr.conf'), 'w') as f:
314 f.write("""
315 [launchpad]
316 dbuser: overlay-user
317@@ -126,7 +125,7 @@
318 self.assertEqual('overlay-user', config.launchpad.dbuser)
319 self.assertEqual('An overlay!', config.launchpad.site_message)
320
321- with open(os.path.join(overlay_dir, '01-test-lazr.conf'), 'w') as f:
322+ with open(overlay_dir.join('01-test-lazr.conf'), 'w') as f:
323 f.write("""
324 [launchpad]
325 site_message: Another overlay!
326@@ -135,7 +134,7 @@
327 self.assertEqual('overlay-user', config.launchpad.dbuser)
328 self.assertEqual('Another overlay!', config.launchpad.site_message)
329
330- os.unlink(os.path.join(overlay_dir, '00-test-lazr.conf'))
331+ os.unlink(overlay_dir.join('00-test-lazr.conf'))
332 with ConfigUseFixture(config_name):
333 self.assertEqual('launchpad_main', config.launchpad.dbuser)
334 self.assertEqual('Another overlay!', config.launchpad.site_message)
335
336=== modified file 'lib/lp/services/log/logger.py'
337--- lib/lp/services/log/logger.py 2018-02-02 10:06:24 +0000
338+++ lib/lp/services/log/logger.py 2018-02-14 11:21:34 +0000
339@@ -219,10 +219,6 @@
340 Use with `testtools.TestCase.addDetail`, `fixtures.Fixture.addDetail`,
341 and anything else that understands details.
342 """
343- # Only import these here to avoid importing testtools outside tests.
344- from testtools.content import (
345- Content,
346- UTF8_TEXT,
347- )
348- get_bytes = lambda: [self.getLogBuffer().encode("utf-8")]
349- return Content(UTF8_TEXT, get_bytes)
350+ # Only import this here to avoid importing testtools outside tests.
351+ from testtools.content import text_content
352+ return text_content(self.getLogBuffer())
353
354=== modified file 'lib/lp/services/tests/test_utils.py'
355--- lib/lp/services/tests/test_utils.py 2018-01-02 16:10:26 +0000
356+++ lib/lp/services/tests/test_utils.py 2018-02-14 11:21:34 +0000
357@@ -340,8 +340,7 @@
358
359 def test_save_and_load(self):
360 data = {1: 2, "room": 101}
361- tempdir = self.useFixture(TempDir()).path
362- tempfile = os.path.join(tempdir, "dump")
363+ tempfile = self.useFixture(TempDir()).join("dump")
364 save_bz2_pickle(data, tempfile)
365 self.assertEqual(data, load_bz2_pickle(tempfile))
366
367
368=== modified file 'lib/lp/services/twistedsupport/tests/test_processmonitor.py'
369--- lib/lp/services/twistedsupport/tests/test_processmonitor.py 2018-01-02 16:10:26 +0000
370+++ lib/lp/services/twistedsupport/tests/test_processmonitor.py 2018-02-14 11:21:34 +0000
371@@ -5,7 +5,7 @@
372
373 __metaclass__ = type
374
375-from testtools.deferredruntest import (
376+from testtools.twistedsupport import (
377 assert_fails_with,
378 AsynchronousDeferredRunTest,
379 flush_logged_errors,
380
381=== modified file 'lib/lp/services/twistedsupport/tests/test_twistedsupport.py'
382--- lib/lp/services/twistedsupport/tests/test_twistedsupport.py 2015-10-14 15:22:01 +0000
383+++ lib/lp/services/twistedsupport/tests/test_twistedsupport.py 2018-02-14 11:21:34 +0000
384@@ -5,7 +5,7 @@
385
386 __metaclass__ = type
387
388-from testtools.deferredruntest import (
389+from testtools.twistedsupport import (
390 assert_fails_with,
391 AsynchronousDeferredRunTest,
392 )
393
394=== modified file 'lib/lp/snappy/tests/test_snapbuildbehaviour.py'
395--- lib/lp/snappy/tests/test_snapbuildbehaviour.py 2017-10-20 13:35:42 +0000
396+++ lib/lp/snappy/tests/test_snapbuildbehaviour.py 2018-02-14 11:21:34 +0000
397@@ -18,7 +18,6 @@
398 from mock import patch
399 from pymacaroons import Macaroon
400 from testtools import ExpectedException
401-from testtools.deferredruntest import AsynchronousDeferredRunTest
402 from testtools.matchers import (
403 AfterPreprocessing,
404 Equals,
405@@ -27,6 +26,7 @@
406 MatchesListwise,
407 StartsWith,
408 )
409+from testtools.twistedsupport import AsynchronousDeferredRunTest
410 import transaction
411 from twisted.internet import defer
412 from twisted.trial.unittest import TestCase as TrialTestCase
413
414=== modified file 'lib/lp/soyuz/adapters/tests/test_archivedependencies.py'
415--- lib/lp/soyuz/adapters/tests/test_archivedependencies.py 2017-06-14 02:44:33 +0000
416+++ lib/lp/soyuz/adapters/tests/test_archivedependencies.py 2018-02-14 11:21:34 +0000
417@@ -9,11 +9,11 @@
418
419 import os.path
420
421-from testtools.deferredruntest import AsynchronousDeferredRunTest
422 from testtools.matchers import (
423 MatchesSetwise,
424 StartsWith,
425 )
426+from testtools.twistedsupport import AsynchronousDeferredRunTest
427 import transaction
428 from twisted.internet import defer
429 from twisted.internet.threads import deferToThread
430
431=== modified file 'lib/lp/soyuz/tests/test_archive.py'
432--- lib/lp/soyuz/tests/test_archive.py 2018-02-14 01:27:28 +0000
433+++ lib/lp/soyuz/tests/test_archive.py 2018-02-14 11:21:34 +0000
434@@ -15,7 +15,6 @@
435
436 from pytz import UTC
437 import six
438-from testtools.deferredruntest import AsynchronousDeferredRunTest
439 from testtools.matchers import (
440 AllMatch,
441 DocTestMatches,
442@@ -26,6 +25,7 @@
443 MatchesStructure,
444 )
445 from testtools.testcase import ExpectedException
446+from testtools.twistedsupport import AsynchronousDeferredRunTest
447 import transaction
448 from twisted.internet import defer
449 from zope.component import getUtility
450
451=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py'
452--- lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py 2018-02-02 03:14:35 +0000
453+++ lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py 2018-02-14 11:21:34 +0000
454@@ -13,8 +13,8 @@
455 import tempfile
456
457 from storm.store import Store
458-from testtools.deferredruntest import AsynchronousDeferredRunTest
459 from testtools.matchers import MatchesListwise
460+from testtools.twistedsupport import AsynchronousDeferredRunTest
461 import transaction
462 from twisted.internet import defer
463 from twisted.trial.unittest import TestCase as TrialTestCase
464
465=== modified file 'lib/lp/soyuz/tests/test_livefsbuildbehaviour.py'
466--- lib/lp/soyuz/tests/test_livefsbuildbehaviour.py 2018-02-02 03:14:35 +0000
467+++ lib/lp/soyuz/tests/test_livefsbuildbehaviour.py 2018-02-14 11:21:34 +0000
468@@ -12,8 +12,8 @@
469
470 import fixtures
471 import pytz
472-from testtools.deferredruntest import AsynchronousDeferredRunTest
473 from testtools.matchers import MatchesListwise
474+from testtools.twistedsupport import AsynchronousDeferredRunTest
475 import transaction
476 from twisted.internet import defer
477 from twisted.trial.unittest import TestCase as TrialTestCase
478
479=== modified file 'lib/lp/testing/keyserver/tests/test_inprocess.py'
480--- lib/lp/testing/keyserver/tests/test_inprocess.py 2017-04-29 15:24:32 +0000
481+++ lib/lp/testing/keyserver/tests/test_inprocess.py 2018-02-14 11:21:34 +0000
482@@ -7,7 +7,7 @@
483
484 __metaclass__ = type
485
486-from testtools.deferredruntest import (
487+from testtools.twistedsupport import (
488 AsynchronousDeferredRunTestForBrokenTwisted,
489 )
490 from twisted.internet import defer
491
492=== modified file 'lib/lp/testing/keyserver/tests/test_web.py'
493--- lib/lp/testing/keyserver/tests/test_web.py 2015-06-24 00:17:11 +0000
494+++ lib/lp/testing/keyserver/tests/test_web.py 2018-02-14 11:21:34 +0000
495@@ -8,7 +8,7 @@
496 import os
497 import shutil
498
499-from testtools.deferredruntest import AsynchronousDeferredRunTest
500+from testtools.twistedsupport import AsynchronousDeferredRunTest
501 from twisted.internet.endpoints import serverFromString
502 from twisted.python.failure import Failure
503 from twisted.web.client import getPage
504
505=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehaviour.py'
506--- lib/lp/translations/tests/test_translationtemplatesbuildbehaviour.py 2017-11-08 10:57:11 +0000
507+++ lib/lp/translations/tests/test_translationtemplatesbuildbehaviour.py 2018-02-14 11:21:34 +0000
508@@ -8,7 +8,7 @@
509 import os
510
511 import pytz
512-from testtools.deferredruntest import AsynchronousDeferredRunTest
513+from testtools.twistedsupport import AsynchronousDeferredRunTest
514 from twisted.internet import defer
515 from zope.component import getUtility
516