mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-10-01 22:48:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Tests] Fix waiting for lt alert state change

Browse source 
Tests are fragile when waiting for lt alert so allow incrementally
waiting for status change, along with a timeout.
This commit is contained in:
Calum Lind 2023-05-29 12:05:56 +01:00
commit de570ae536
No known key found for this signature in database
GPG key ID: 90597A687B836BA3
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
deluge/tests/test_torrent.py
View file

@ -66,9 +66,22 @@ class TestTorrent(BaseTestCase):
print(tmp) print(tmp)
def assert_state(self, torrent, state): def assert_state(self, torrent, state):
"""Assert torrent state matches expected state"""
torrent.update_state() torrent.update_state()
assert torrent.state == state assert torrent.state == state
def assert_state_wait(self, torrent, expected, timeout=1, interval=0.2):
"""Assert state but retry with timeout e.g. Allow for async lt alerts"""
start = time.time()
while time.time() - start < timeout:
torrent.update_state()
time.sleep(interval)
if torrent.state == expected:
break
else:
assert torrent.state == expected
def get_torrent_atp(self, filename): def get_torrent_atp(self, filename):
filename = common.get_test_data_file(filename) filename = common.get_test_data_file(filename)
with open(filename, 'rb') as _file: with open(filename, 'rb') as _file:
@ -193,13 +206,12 @@ class TestTorrent(BaseTestCase):
torrent_id = self.core.add_torrent_file(filename, filedump, options) torrent_id = self.core.add_torrent_file(filename, filedump, options)
torrent = self.core.torrentmanager.torrents[torrent_id] torrent = self.core.torrentmanager.torrents[torrent_id]
# time.sleep(0.5) # Delay to wait for lt to finish check on Travis. # Inital check will fail and return to download state
# self.assert_state(torrent, 'Seeding') self.assert_state_wait(torrent, 'Downloading')
# Force an error by reading (non-existant) piece from disk # Force an error by reading (non-existant) piece from disk
torrent.handle.read_piece(0) torrent.handle.read_piece(0)
time.sleep(0.2) # Delay to wait for alert from lt self.assert_state_wait(torrent, 'Error')
self.assert_state(torrent, 'Error')
def test_torrent_error_resume_original_state(self): def test_torrent_error_resume_original_state(self):
options = {'seed_mode': True, 'add_paused': True} options = {'seed_mode': True, 'add_paused': True}
@ -214,8 +226,7 @@ class TestTorrent(BaseTestCase):
# Force an error by reading (non-existant) piece from disk # Force an error by reading (non-existant) piece from disk
torrent.handle.read_piece(0) torrent.handle.read_piece(0)
time.sleep(0.2) # Delay to wait for alert from lt self.assert_state_wait(torrent, 'Error')
self.assert_state(torrent, 'Error')
# Clear error and verify returned to original state # Clear error and verify returned to original state
torrent.force_recheck() torrent.force_recheck()