mirrors/deluge
1
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-04 11:27:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

[Tests] Use async for ConsoleUI tests

Browse source
This commit is contained in:
Calum Lind 2025-02-17 22:35:43 +00:00
parent cb182daaaf
commit 7071da85c3
No known key found for this signature in database
GPG key ID: 90597A687B836BA3
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
deluge/tests/test_ui_entry.py
View file

@ -12,8 +12,6 @@ from io import StringIO
from unittest import mock from unittest import mock
import pytest import pytest
import pytest_twisted
from twisted.internet import defer
import deluge import deluge
import deluge.component as component import deluge.component as component
@ -346,14 +344,13 @@ class ConsoleUIWithDaemonBaseTestCase(UIWithDaemonBaseTestCase):
+ command, + command,
) )
@pytest_twisted.inlineCallbacks async def test_console_command_add(self):
def test_console_command_add(self):
filename = common.get_test_data_file('test.torrent') filename = common.get_test_data_file('test.torrent')
self.patch_arg_command([f'add "{filename}"']) self.patch_arg_command([f'add "{filename}"'])
fd = StringFileDescriptor(sys.stdout) fd = StringFileDescriptor(sys.stdout)
self.patch(sys, 'stdout', fd) self.patch(sys, 'stdout', fd)
yield self.exec_command() await self.exec_command()
std_output = fd.out.getvalue() std_output = fd.out.getvalue()
assert ( assert (
@ -361,8 +358,7 @@ class ConsoleUIWithDaemonBaseTestCase(UIWithDaemonBaseTestCase):
== 'Attempting to add torrent: ' + filename + '\nTorrent added!\n' == 'Attempting to add torrent: ' + filename + '\nTorrent added!\n'
) )
@pytest_twisted.inlineCallbacks async def test_console_command_add_move_completed(self):
def test_console_command_add_move_completed(self):
filename = common.get_test_data_file('test.torrent') filename = common.get_test_data_file('test.torrent')
tmp_path = 'c:\\tmp' if windows_check() else '/tmp' tmp_path = 'c:\\tmp' if windows_check() else '/tmp'
self.patch_arg_command( self.patch_arg_command(
@ -377,7 +373,7 @@ class ConsoleUIWithDaemonBaseTestCase(UIWithDaemonBaseTestCase):
fd = StringFileDescriptor(sys.stdout) fd = StringFileDescriptor(sys.stdout)
self.patch(sys, 'stdout', fd) self.patch(sys, 'stdout', fd)
yield self.exec_command() await self.exec_command()
std_output = fd.out.getvalue() std_output = fd.out.getvalue()
assert std_output.endswith( assert std_output.endswith(
@ -397,13 +393,12 @@ class ConsoleUIWithDaemonBaseTestCase(UIWithDaemonBaseTestCase):
assert std_output.startswith('Total upload: ') assert std_output.startswith('Total upload: ')
assert std_output.endswith(' Moving: 0\n') assert std_output.endswith(' Moving: 0\n')
@defer.inlineCallbacks async def test_console_command_config_set_download_location(self):
def test_console_command_config_set_download_location(self):
fd = StringFileDescriptor(sys.stdout) fd = StringFileDescriptor(sys.stdout)
self.patch_arg_command(['config --set download_location /downloads']) self.patch_arg_command(['config --set download_location /downloads'])
self.patch(sys, 'stdout', fd) self.patch(sys, 'stdout', fd)
yield self.exec_command() await self.exec_command()
std_output = fd.out.getvalue() std_output = fd.out.getvalue()
assert std_output.startswith('Setting "download_location" to: \'/downloads\'') assert std_output.startswith('Setting "download_location" to: \'/downloads\'')
assert std_output.endswith('Configuration value successfully updated.\n') assert std_output.endswith('Configuration value successfully updated.\n')