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.

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

Adapt encrypted_volume_activation for storage-ng #3887

Merged
merged 1 commit into from Nov 9, 2017

Conversation

okurz
Copy link
Member

@okurz okurz commented Nov 8, 2017

send_key 'alt-p';
assert_screen 'encrypted_volume_password_prompt';
type_password;
send_key 'ret';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't this line is doing same as line 47 just in different way ? can we keep this consistent ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would even go further . what about such refactor :

if (! match_has_tag 'encrypted_volume_activation_prompt-embedded_password_prompt') {
            send_key 'alt-p';
            assert_screen 'encrypted_volume_password_prompt';
        }
        type_password;
         send_key 'ret';

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can replace send_key 'ret' with send_key $cmd{ok} it doesn't matter

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, unfortunately it does not seem to behave the same. In the new dialog somehow there is no button pre-selected so 'ret' does not do anything because no button is focused but only the password prompt. This is why I kept it separate. I did not want to change old behaviour and did not check if 'ok' works in the old way. Can we keep it as is?

@asmorodskyi asmorodskyi merged commit 48ff1e7 into os-autoinst:master Nov 9, 2017
@okurz okurz deleted the fix/encrypt_activation branch November 10, 2017 10:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants