-
Notifications
You must be signed in to change notification settings - Fork 280
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
Change the shortcut for yast-iscsi-client on 15-SP6 #20645
base: master
Are you sure you want to change the base?
Conversation
f2995fa
to
97e9cf8
Compare
According to https://bugzilla.suse.com/show_bug.cgi?id=1231385#c9, the shortcut has been changed. So we need to adapt our test code. Related: https://jira.suse.com/browse/TEAM-9833
tests/ha/iscsi_client.pm
Outdated
@@ -61,12 +61,12 @@ sub run { | |||
for (1 .. 40) { send_key 'backspace'; } | |||
type_string 'iqn.1996-04.de.suse:01:' . get_hostname . '.' . get_cluster_name; | |||
wait_still_screen 3; | |||
send_key 'alt-v'; # discoVered targets | |||
is_sle("=15-SP6") ? send_key 'alt-d' : send_key 'alt-v'; # discovered targets |
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.
Not sure if the module is tested in leap15.6. Let me check that. Thanks.
2b58dd1
to
0bd03eb
Compare
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.
LGTM.
send_key_until_needlematch 'iscsi-client-discovery', 'alt-d'; | ||
|
||
# According to https://bugzilla.suse.com/show_bug.cgi?id=1231385#c9, change the hotkey for 15-SP6 | ||
is_sle('=15-SP6') ? send_key_until_needlematch 'iscsi-client-discovery', 'alt-i' : send_key_until_needlematch 'iscsi-client-discovery', 'alt-d'; |
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.
this looks better, just my suggestion:
my $key = is_sle('15-SP6') ? 'alt-i': 'alt-d'l;
send_key_until_needlematch 'iscsi-client-discovery', $key;
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.
LGTM, thanks
For 15-SP6 incidents test, we need to keep the older hotkey. So I change this PR to Draft. Need to think more how to handle that. |
send_key 'alt-v'; # discoVered targets | ||
|
||
# According to https://bugzilla.suse.com/show_bug.cgi?id=1231385#c9, change the hotkey for 15-SP6 | ||
is_sle('=15-SP6') ? send_key 'alt-d' : send_key 'alt-v'; # discovered targets |
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.
Let's make it is_sle('>=15-SP6')
... seems the update got into 15-SP7 too: https://openqa.suse.de/tests/overview?distri=sle&version=15-SP7&build=41.1&groupid=143
I also wonder if it would make sense to check the version of yast2-iscsi-client
instead of the OS version.
Oh. Good catch. Yes, before update goes out, we'll have different hot keys even on the same OS versions. I think there's no choice but to try to get the version of |
According to https://bugzilla.suse.com/show_bug.cgi?id=1231385#c9, the shortcut has been changed. So we need to adapt our test code.
Related: https://jira.suse.com/browse/TEAM-9833
VRs:
https://openqa.suse.de/tests/15947382# (iscsi_client passed)