Add error handling for full state runs; fix apply_dom0 error handling #686
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eloquence
force-pushed
the
668-better-error-handling
branch
from
728253f to
e71fb58
Compare
eloquence
commented
Apr 7, 2021
| MIGRATION_DIR = "potato" | ||
| updater.run_full_install() | ||
| calls = [["sdw-admin", "--apply"], ["sudo", "rm", "-rf", MIGRATION_DIR]] | ||
| assert mock_call.has_calls(calls, any_order=False) |
There was a problem hiding this comment.
This test never worked - has_calls is the wrong method name, so it just runs an assertion against the mock that will always succeed, just like assert mock_call.nonsense() would - thanks to unittest.mock.MagicMock.
MIGRATION_DIR is also not imported, so this will just create a local variable. We should IMO patch it rather than importing and modifying it (the rewritten test does so).
eloquence
commented
Apr 7, 2021
| MIGRATION_DIR = "potato" | ||
| updater.run_full_install() | ||
| calls = [["sdw-admin", "--apply"], ["sudo", "rm", "-rf", MIGRATION_DIR]] | ||
| assert mock_call.has_calls(calls, any_order=False) |
sssoleileraaa
approved these changes
Apr 8, 2021
There was a problem hiding this comment.
Testing
Fix for #668
- Install an RPM from this branch (either via
make stagingordnf reinstallof the built RPM aftermake clone) - Ensure a migration flag is present in
/tmp/sdw-migrations(this will be the case after an RPM install until Removes migration flag from postinst #667 is merged) - Modify your copy of
/usr/share/securedrop-workstation-dom0-config/scripts/provision-alltoexit 1immediately - Run the updater with
/opt/securedrop/launcher/sdw-launcher.py --skip-delta 0 -
- Observe that the updater ultimately reports an error
Updater reports generic "Security updates failed" error message
-
- Observe that the
apply_allerror is logged in~/.securedrop_launcher/logs/launcher.log
- Observe that the
logs contained "Failed to apply full system state" and that "sdw-admin --apply" returned a non-zero exit status 1
-
- Observe that the migration flag is still present (i.e. the updater will try again)
- Undo your modification to
/usr/share/securedrop-workstation-dom0-config/scripts/provision-all
Fix for #685
- Install an RPM from this branch (either via
make stagingordnf reinstallof the built RPM after `make clone) - Remove
/tmp/sdw-migrationsif it exists - Modify your copy of
/srv/salt/update-xfce-settingstoexit 1immediately - Run the updater with
/opt/securedrop/launcher/sdw-launcher.py --skip-delta 0
First I had a network error (oh the pain of waiting for the updater to run all the way through even though I knew it would error around the 5% mark)
-
- Observe that the updater ultimately reports an error
-
- Observe that the
apply_dom0error is logged in~/.securedrop_launcher/logs/launcher.log
- Observe that the
- Undo your modification to
/srv/salt/update-xfce-settings
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Fixes #668 (together with #684; will file separate issue for logging improvements)
Fixes #685
Testing
Fix for #668
make stagingordnf reinstallof the built RPM aftermake clone)/tmp/sdw-migrations(this will be the case after an RPM install until Removes migration flag from postinst #667 is merged)/usr/share/securedrop-workstation-dom0-config/scripts/provision-alltoexit 1immediately/opt/securedrop/launcher/sdw-launcher.py --skip-delta 0apply_allerror is logged in~/.securedrop_launcher/logs/launcher.log/usr/share/securedrop-workstation-dom0-config/scripts/provision-allFix for #685
make stagingordnf reinstallof the built RPM after `make clone)/tmp/sdw-migrationsif it exists/srv/salt/update-xfce-settingstoexit 1immediately/opt/securedrop/launcher/sdw-launcher.py --skip-delta 0apply_dom0error is logged in~/.securedrop_launcher/logs/launcher.log/srv/salt/update-xfce-settings