Merge lp:~cjwatson/storm/reporter-circular-import-workaround into lp:storm

Proposed by Colin Watson
Status: Merged
Merged at revision: 487
Proposed branch: lp:~cjwatson/storm/reporter-circular-import-workaround
Merge into: lp:storm
Diff against target: 17 lines (+6/-0)
1 file modified
test (+6/-0)
To merge this branch: bzr merge lp:~cjwatson/storm/reporter-circular-import-workaround
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+368122@code.launchpad.net

Commit message

Work around circular import bug in twisted.trial.reporter.

Description of the change

I've submitted https://github.com/twisted/twisted/pull/1148 to fix this properly, but the bug has been in Twisted stable releases since 16.0.0 so it gets in the way of testing using tox.

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test'
2--- test 2011-10-28 14:46:12 +0000
3+++ test 2019-05-30 09:57:25 +0000
4@@ -56,8 +56,14 @@
5
6
7 def test_with_trial():
8+ from twisted.trial import unittest as trial_unittest
9 from twisted.trial.reporter import TreeReporter
10 from twisted.trial.runner import TrialRunner
11+
12+ # This is only imported to work around
13+ # https://twistedmatrix.com/trac/ticket/8267.
14+ trial_unittest
15+
16 runner = TrialRunner(reporterFactory=TreeReporter, realTimeErrors=True)
17 return test_with_runner(runner)
18

Subscribers

People subscribed via source and target branches

to status/vote changes: