Repository navigation
admin: set favorites as default Qubes menu #1978
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import pytest | ||
| from qubesadmin.app import VMCollection | ||
|
|
||
| from securedrop_manage import main as manage | ||
| from tests.markers import needs_admin | ||
|
|
||
| pytestmark = needs_admin | ||
|
|
||
|
|
||
| @pytest.mark.provisioning | ||
| def test_app_menu_opens_to_favorites(all_vms: VMCollection) -> None: | ||
| assert all_vms["dom0"].features.get("menu-initial-page") == "favorites_page" | ||
|
|
||
|
|
||
| @pytest.mark.provisioning | ||
| def test_admin_menu_favorites(all_vms: VMCollection) -> None: | ||
| """ | ||
| Favorites point at the dom0 launchers, so apps start via sdw-updater. | ||
| For dom0 apps the menu matches against the full .desktop file name. | ||
| """ | ||
| favorites = all_vms["dom0"].features.get("menu-favorites", "") | ||
| assert favorites == manage.ADMIN_DOM0_MENU_FEATURES["menu-favorites"] | ||
| # No favorites on the qubes themselves, which would bypass sdw-updater | ||
| for vm in ("sd-admin", "sd-admin-vault"): | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nice, maybe this should be for all VMs? |
||
| assert not all_vms[vm].features.get("menu-favorites") | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we really need to worry about this, just because on each dom0 salt run (updater), it's going to override any user customized changes anyways. So I think we could just unconditionally unset these.
Since this is just for uninstall code I'll leave it for a follow-up.