Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep project recoveries from 6.9 onwards separate #36909

Closed
wants to merge 2 commits into from
Closed

Keep project recoveries from 6.9 onwards separate #36909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b54474
Keep project recoveries from 6.9 onwards separate.
jclarkeSTFC Feb 21, 2024
5f130ec
Update test folder path
jclarkeSTFC Feb 21, 2024
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
2 changes: 1 addition & 1 deletion docs/source/release/v6.9.0/mantidworkbench.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ New Features
- Editing a plot's title will now automatically update its name in the plot selector (and vice versa).
- Monitor for external changes to script files that are open in Mantid to prevent loss of work.
- An email is now required to submit an error report.
- Project recovery performance has been improved by saving one python file for all workspaces, rather than one python file per workspace. Caution: recovering a backup by opening 6.9.0 after a crash in 6.8.0 or earlier will not work.
- Project recovery performance has been improved by saving one python file for all workspaces, rather than one python file per workspace. Caution: it will not be possible in 6.9.0 to recover a backup created in 6.8.0 or earlier, and vice versa.


Bugfixes
Expand Down
2 changes: 1 addition & 1 deletion qt/applications/workbench/workbench/projectrecovery/projectrecovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

class ProjectRecovery(object):
recovery_ordered_recovery_file_name = "ordered_recovery.py"
recovery_workbench_recovery_name = "workbench-recovery"
recovery_workbench_recovery_name = "workbench-recovery-6_9-onwards"
recovery_file_ext = ".recfile"
lock_file_name = "projectrecovery.lock"

Expand Down
7 changes: 4 additions & 3 deletions qt/applications/workbench/workbench/projectrecovery/test/test_projectrecovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,15 @@ def tearDown(self):

def test_constructor_settings_are_set(self):
# Test the paths set in the constructor that are generated.
self.assertEqual(self.pr.recovery_directory, os.path.join(ConfigService.getAppDataDirectory(), "workbench-recovery"))
recovery_folder = "workbench-recovery-6_9-onwards"
self.assertEqual(self.pr.recovery_directory, os.path.join(ConfigService.getAppDataDirectory(), recovery_folder))
self.assertEqual(
self.pr.recovery_directory_hostname,
os.path.join(ConfigService.getAppDataDirectory(), "workbench-recovery", socket.gethostname()),
os.path.join(ConfigService.getAppDataDirectory(), recovery_folder, socket.gethostname()),
)
self.assertEqual(
self.pr.recovery_directory_pid,
os.path.join(ConfigService.getAppDataDirectory(), "workbench-recovery", socket.gethostname(), str(os.getpid())),
os.path.join(ConfigService.getAppDataDirectory(), recovery_folder, socket.gethostname(), str(os.getpid())),
)
self.assertEqual(
self.pr.recovery_order_workspace_history_file, os.path.join(ConfigService.getAppDataDirectory(), "ordered_recovery.py")
Expand Down
Loading