Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,13 @@ def reset_config():
if item_name.name != "mscolab.db":
item_name.unlink()

# Remove the client-side "work locally" cache. create_local_operation_file reuses an
# existing FTML file, so stale waypoints would leak into any later test (or repeated
# run of the same test) that toggles the work-locally mode.
local_colabdata = constants.ROOT_DIR / "local_colabdata"
if local_colabdata.exists():
shutil.rmtree(local_colabdata, ignore_errors=True)

generate_initial_config()
create_msui_settings_file("{}")
read_config_file()
Expand Down
2 changes: 1 addition & 1 deletion tests/_test_msui/test_mscolab_merge_waypoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def setup(self, qtbot, mscolab_app, mscolab_server):
self.window = msui.MSUIMainWindow(local_operations_data=ROOT_DIR)
self.window.create_new_flight_track()
self.emailid = 'merge@alpha.org'
self.local_mscolab_data = ROOT_DIR / "local_mscolab_data"
self.local_mscolab_data = ROOT_DIR / "local_colabdata"
yield
self.window.mscolab.logout()
mslib.utils.auth.del_password_from_keyring("merge@alpha.org")
Expand Down
Loading