Adapt partitioning_lvm for *activate_existing* tests to storage_ng #4354
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
rwx788
reviewed
Feb 5, 2018
lib/partition_setup.pm
Outdated
| @@ -196,7 +196,7 @@ sub unselect_xen_pv_cdrom { | |||
| sub enable_encryption_guided_setup { | |||
| my $self = shift; | |||
| send_key $cmd{encryptdisk}; | |||
| if (!get_var('ENCRYPT_ACTIVATE_EXISTING')) { | |||
| if (!get_var('ENCRYPT_ACTIVATE_EXISTING') || is_storage_ng) { | |||
There was a problem hiding this comment.
better add a comment above this line
| if ($numdisks <= 1) { | ||
| die "Guided workflow does not skip disk selection when only one disk!" | ||
| unless match_has_tag('inst-select-disk-to-use-as-root'); | ||
|
|
| if (is_storage_ng) { | ||
| if ($numdisks <= 1) { | ||
| die "Guided workflow does not skip disk selection when only one disk!" | ||
| unless match_has_tag('inst-select-disk-to-use-as-root'); |
There was a problem hiding this comment.
we should fail unconditionally here, as match_has_tag('inst-select-disk-to-use-as-root') is already above
| } | ||
| else { | ||
| die "Guided workflow does skip disk selection when more than one disk! (NUMDISKS=$numdisks)" | ||
| unless match_has_tag('inst-partition-guided'); |
There was a problem hiding this comment.
On the line 89 we already have match, so if will always die unless same needle has both tags, which is not expected, I guess.
rwx788
approved these changes
Feb 6, 2018
okurz
reviewed
Feb 6, 2018
| @@ -127,15 +100,14 @@ sub run { | |||
| send_key "tab"; | |||
| type_password; | |||
| send_key "ret"; | |||
| assert_screen "partition-cryptlvm-summary"; | |||
| assert_screen "partition- | |||
| cryptlvm-summary"; | |||
There was a problem hiding this comment.
tidy issue, I'm sure
There was a problem hiding this comment.
changed this manually, please check.
- adapt workflow at guided setup for storage_ng - clean up record_soft_failure for issue resolved - verification run sles 15: http://e13.suse.de/tests/326#step/partitioning_lvm - verification run sles 12 sp4: http://e13.suse.de/tests/330#step/partitioning_lvm - add inst-encrypt-password-prompt in enable_encryption_guided_setup - see poo#30637 for more details - needle PR: https://gitlab.suse.de/openqa/os-autoinst-needles-sles/merge_requests/687
|
needles merged, LGTM. Waiting for checks |
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.
https://gitlab.suse.de/openqa/os-autoinst-needles-sles/merge_requests/687