peter/borgmatic
1
0
Fork 0
mirror of https://github.com/borgmatic-collective/borgmatic.git synced 2026-07-22 02:03:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading race conditions.

Browse Source
This commit is contained in:
Dan Helfman
2026-05-30 22:22:06 -07:00
parent 64ceebb2c8
commit dc91f81a39
7 changed files with 70 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/actions/browse/test_archives_list.py
-16
View File
@@ -6,10 +6,6 @@ import textual.widgets.option_list
def test_archives_list_on_option_list_option_highlighted_with_highlighted_none_marks_it_unchanged():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator')
flexmock(module.borgmatic.actions.browse.workers).should_receive('add_repository_archives')
flexmock(module.borgmatic.actions.browse.archives_list.Archives_list).should_receive(
'app'
).and_return(flexmock())
archives_list = module.Archives_list(config=flexmock(), repository=flexmock())
archives_list.highlighted = None
@@ -20,10 +16,6 @@ def test_archives_list_on_option_list_option_highlighted_with_highlighted_none_m
def test_archives_list_on_option_list_option_highlighted_with_highlighted_zero_marks_it_unchanged():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator')
flexmock(module.borgmatic.actions.browse.workers).should_receive('add_repository_archives')
flexmock(module.borgmatic.actions.browse.archives_list.Archives_list).should_receive(
'app'
).and_return(flexmock())
archives_list = module.Archives_list(config=flexmock(), repository=flexmock())
archives_list.highlighted = 0
@@ -34,10 +26,6 @@ def test_archives_list_on_option_list_option_highlighted_with_highlighted_zero_m
def test_archives_list_on_option_list_option_highlighted_with_highlighted_zero_marks_it_unchanged():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator')
flexmock(module.borgmatic.actions.browse.workers).should_receive('add_repository_archives')
flexmock(module.borgmatic.actions.browse.archives_list.Archives_list).should_receive(
'app'
).and_return(flexmock())
archives_list = module.Archives_list(config=flexmock(), repository=flexmock())
archives_list.add_option(textual.widgets.option_list.Option('zero', id='zero'))
@@ -49,10 +37,6 @@ def test_archives_list_on_option_list_option_highlighted_with_highlighted_zero_m
def test_archives_list_on_option_list_option_highlighted_with_highlighted_non_zero_marks_it_changed():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator')
flexmock(module.borgmatic.actions.browse.workers).should_receive('add_repository_archives')
flexmock(module.borgmatic.actions.browse.archives_list.Archives_list).should_receive(
'app'
).and_return(flexmock())
archives_list = module.Archives_list(config=flexmock(), repository=flexmock())
archives_list.add_option(textual.widgets.option_list.Option('zero', id='zero'))
tests/integration/actions/browse/test_directory_list.py
+5 -28
View File
@@ -121,12 +121,8 @@ def test_add_archive_paths_retains_loading_indicator_at_bottom():
assert directory_list.highlighted == 2
def test_directory_list_with_root_directory_starts_loading_archive_paths():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator')
flexmock(module.borgmatic.actions.browse.workers).should_receive('load_archive_paths').once()
flexmock(module.borgmatic.actions.browse.directory_list.Directory_list).should_receive(
'app'
).and_return(flexmock())
def test_directory_list_with_root_directory_adds_loading_indicator():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator').once()
directory_list = module.Directory_list(
config=flexmock(), repository=flexmock(), archive_name='archive'
@@ -136,26 +132,6 @@ def test_directory_list_with_root_directory_starts_loading_archive_paths():
assert not directory_list.path_loaded.complete
def test_directory_list_with_non_root_directory_relies_on_existing_path_loading_worker():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator')
flexmock(module.borgmatic.actions.browse.workers).should_receive('load_archive_paths').never()
flexmock(module.borgmatic.actions.browse.directory_list.Directory_list).should_receive(
'app'
).and_return(flexmock())
directory_list = module.Directory_list(
config=flexmock(),
repository=flexmock(),
archive_name='archive',
path_loaded=flexmock(complete=False),
path_components=('etc',),
)
assert directory_list.border_title == '📁 etc'
assert len(directory_list.options) == 1
assert directory_list.options[0].prompt == '📁 ..'
assert directory_list.options[0].id == '..'
def test_directory_list_with_already_complete_loading_skips_loading_indicator():
flexmock(module.borgmatic.actions.browse.loading).should_receive(
'add_inline_loading_indicator'
@@ -178,12 +154,12 @@ def test_directory_list_with_already_complete_loading_skips_loading_indicator():
assert directory_list.options[0].id == '..'
def test_directory_list_on_mount_with_root_directory_skips_adding_archives_paths():
def test_directory_list_on_mount_with_root_directory_loads_archive_paths():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator')
flexmock(module.borgmatic.actions.browse.workers).should_receive('load_archive_paths')
flexmock(module.borgmatic.actions.browse.directory_list.Directory_list).should_receive(
'app'
).and_return(flexmock())
flexmock(module.borgmatic.actions.browse.workers).should_receive('load_archive_paths').once()
flexmock(module).should_receive('add_archive_paths').never()
directory_list = module.Directory_list(
config=flexmock(), repository=flexmock(), archive_name='archive'
@@ -198,6 +174,7 @@ def test_directory_list_on_mount_with_non_root_directory_adds_archive_paths():
flexmock(module.borgmatic.actions.browse.directory_list.Directory_list).should_receive(
'app'
).and_return(flexmock())
flexmock(module.borgmatic.actions.browse.workers).should_receive('load_archive_paths').never()
flexmock(module).should_receive('add_archive_paths').once()
directory_list = module.Directory_list(
config=flexmock(),
tests/integration/actions/browse/test_file_preview.py
-4
View File
@@ -6,10 +6,6 @@ import textual.widgets.option_list
def test_file_preview_does_not_raise():
flexmock(module.borgmatic.actions.browse.loading).should_receive('add_inline_loading_indicator')
flexmock(module.borgmatic.actions.browse.workers).should_receive('load_file_preview')
flexmock(module.borgmatic.actions.browse.file_preview.File_preview).should_receive(
'app'
).and_return(flexmock())
module.File_preview(
config=flexmock(), repository=flexmock(), archive_name='archive', file_path='foo/bar.txt'