Adding upstream version 2.1.2~dev0+20230529.upstream/2.1.2_dev0+20230529

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 4 deletions

diff --git a/deluge/tests/test_ui_entry.py b/deluge/tests/test_ui_entry.py
index 0546ad7..9a1330e 100644
--- a/deluge/tests/test_ui_entry.py
+++ b/deluge/tests/test_ui_entry.py
@@ -58,7 +58,7 @@ class StringFileDescriptor:
 
 class UIBaseTestCase:
     def set_up(self):
-        common.setup_test_logger(level='info', prefix=self.id())
+        common.setup_test_logger(level='info', prefix=self.config_dir / self.id())
         return component.start()
 
     def tear_down(self):
@@ -75,7 +75,7 @@ class UIWithDaemonBaseTestCase(UIBaseTestCase, DaemonBase):
 
     def set_up(self):
         d = self.common_set_up()
-        common.setup_test_logger(level='info', prefix=self.id())
+        common.setup_test_logger(level='info', prefix=self.config_dir / self.id())
         return d
 
 
@@ -386,7 +386,6 @@ class ConsoleUIWithDaemonBaseTestCase(UIWithDaemonBaseTestCase):
             f'move_completed_path: {tmp_path}\nmove_completed: True\n'
         )
 
-    @pytest_twisted.ensureDeferred
     async def test_console_command_status(self):
         fd = StringFileDescriptor(sys.stdout)
         self.patch_arg_command(['status'])
@@ -416,7 +415,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'],
         }