Deluge
diff options
| author | DjLegolas <djlegolas@protonmail.com> | 2023-01-23 00:25:32 +0200 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2023-02-24 10:43:09 +0000 |
| commit | 4de754328f9b90c426f44b3b83eb4ae8bcfc5ea1 (patch) | |
| tree | e1c2dc8bab04d67330a402611ae2a1b9103ffbe6 | |
| parent | c4b9cc7292b3fb8756feee6ce3da485cd97ef556 (diff) | |
| download | deluge-4de754328f9b90c426f44b3b83eb4ae8bcfc5ea1.tar.gz deluge-4de754328f9b90c426f44b3b83eb4ae8bcfc5ea1.tar.bz2 deluge-4de754328f9b90c426f44b3b83eb4ae8bcfc5ea1.zip | |
[ConsoleUI] remove `deferred` being returned after command
A `return` statement was added in ece31cf for unit testing to work but
this resulted in Deferred printed in console output.
Added a test_start entry point to return the required deferreds while
removing the return from original start entrypoint.
Closes: https://dev.deluge-torrent.org/ticket/3582
Closes: https://github.com/deluge-torrent/deluge/pull/408
| -rw-r--r-- | deluge/tests/test_ui_entry.py | 2 | ||||
| -rw-r--r-- | deluge/ui/console/__init__.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/deluge/tests/test_ui_entry.py b/deluge/tests/test_ui_entry.py index 0546ad7b8..3e7ce54b6 100644 --- a/deluge/tests/test_ui_entry.py +++ b/deluge/tests/test_ui_entry.py @@ -416,7 +416,7 @@ class TestConsoleScriptEntryWithDaemon(BaseTestCase, ConsoleUIWithDaemonBaseTest def set_var(self, request): request.cls.var = { 'cmd_name': 'deluge-console', - 'start_cmd': deluge.ui.console.start, + 'start_cmd': deluge.ui.console.test_start, 'sys_arg_cmd': ['./deluge-console'], } diff --git a/deluge/ui/console/__init__.py b/deluge/ui/console/__init__.py index 7da04a6de..a09d9366c 100644 --- a/deluge/ui/console/__init__.py +++ b/deluge/ui/console/__init__.py @@ -12,5 +12,13 @@ UI_PATH = __path__[0] def start(): + Console().start() + +def test_start(): + """Entry point for tests + + A workaround for unit tests which require a deferred object to be + returned to run properly due to mocking the Twisted reactor. + """ return Console().start() |