Use generic tag 'screenlock-password' instead of gnome-screenlock-password in ensure_unlocked_desktop #5614
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
|
Tested locally with opensuse-Tumbleweed-DVD-aarch64-Build20180813-lxde@aarch64 |
okurz
reviewed
Aug 21, 2018
lib/utils.pm
Outdated
| @@ -436,15 +436,15 @@ sub workaround_type_encrypted_passphrase { | |||
| sub ensure_unlocked_desktop { | |||
| my $counter = 10; | |||
| while ($counter--) { | |||
| assert_screen [qw(displaymanager displaymanager-password-prompt generic-desktop screenlock gnome-screenlock-password)], no_wait => 1; | |||
| assert_screen [qw(displaymanager displaymanager-password-prompt generic-desktop screenlock gnome-screenlock-password xscreensaver-screenlock-password)], no_wait => 1; | |||
There was a problem hiding this comment.
How about we replace gnome-screenlock-password with screenlock-password? I can not imagine a situation where we need to distinguish between the two so it should be easier to reuse the more generic tag
ggardet
changed the title
|
@okurz PR updated. |
|
Hello, it seems that after this PR was merged, QAM tests have started failing in consoletest_finish: |
|
So is it missing new needles for sle? |
|
Yes, sorry, we missed SLE
|
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.
This will fix https://progress.opensuse.org/issues/39734 for LXDE case, once related needles will be merged: os-autoinst/os-autoinst-needles-opensuse#420