| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 1 | From 754f21282ad2775db8ff501d40bbc497faeb17ba Mon Sep 17 00:00:00 2001 |
| 2 | From: Trevor Gamblin <trevor.gamblin@windriver.com> |
| 3 | Date: Tue, 17 Dec 2019 15:09:22 -0500 |
| 4 | Subject: [PATCH] fix MemoryReactor import in test_runner to be from |
| 5 | twisted.internet.testing |
| 6 | |
| 7 | Upstream-Status: Backport [https://github.com/twisted/twisted/commit/754f21282ad2775db8ff501d40bbc497faeb17ba] |
| 8 | |
| 9 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> |
| 10 | --- |
| 11 | src/twisted/application/newsfragments/9746.misc | 1 + |
| 12 | src/twisted/application/runner/test/test_runner.py | 2 +- |
| 13 | 2 files changed, 2 insertions(+), 1 deletion(-) |
| 14 | create mode 100644 src/twisted/application/newsfragments/9746.misc |
| 15 | |
| 16 | diff --git a/src/twisted/application/newsfragments/9746.misc b/src/twisted/application/newsfragments/9746.misc |
| 17 | new file mode 100644 |
| 18 | index 000000000..8b1378917 |
| 19 | --- /dev/null |
| 20 | +++ b/src/twisted/application/newsfragments/9746.misc |
| 21 | @@ -0,0 +1 @@ |
| 22 | + |
| 23 | diff --git a/src/twisted/application/runner/test/test_runner.py b/src/twisted/application/runner/test/test_runner.py |
| 24 | index 9abc3449a..cce495b12 100644 |
| 25 | --- a/src/twisted/application/runner/test/test_runner.py |
| 26 | +++ b/src/twisted/application/runner/test/test_runner.py |
| 27 | @@ -15,7 +15,7 @@ from twisted.logger import ( |
| 28 | LogLevel, LogPublisher, LogBeginner, |
| 29 | FileLogObserver, FilteringLogObserver, LogLevelFilterPredicate, |
| 30 | ) |
| 31 | -from twisted.test.proto_helpers import MemoryReactor |
| 32 | +from twisted.internet.testing import MemoryReactor |
| 33 | |
| 34 | from ...runner import _runner |
| 35 | from .._exit import ExitStatus |
| 36 | -- |
| 37 | 2.24.1 |
| 38 | |