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

Adjust SCC registration yast test for SLE15 #4431

Merged
merged 1 commit into from Feb 27, 2018

Conversation

rwx788
Copy link
Member

@rwx788 rwx788 commented Feb 16, 2018

The main issue here was that we use already registered image.
Nevertheless, we can simply clean registration data and perform clean
registration again.

See poo#29423.

Needles.

  • Verification runs:
    • sle15
    • sle12 NOTE, fails on the bug at the moment

sub run {
my ($self) = @_;
x11_start_program('xterm');
sub prepare_reg_sle12 {
Copy link
Member

Choose a reason for hiding this comment

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

how about having single function prepare_reg which check version inside ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've wrapped it in test_setup already, so don't really want to put it in one piece of code.

lib/y2x11test.pm Outdated
@@ -34,6 +34,9 @@ sub launch_yast2_module_x11 {
type_password;
send_key 'ret';
assert_screen $args{target_match}, $args{match_timeout};
# Uses hotkey for gnome, adjust if need for other desktop
send_key 'alt-f10' if $args{maximize_window};

Copy link
Member

Choose a reason for hiding this comment

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

delete blank line before end of function

@@ -34,6 +34,9 @@ sub launch_yast2_module_x11 {
type_password;
send_key 'ret';
assert_screen $args{target_match}, $args{match_timeout};
# Uses hotkey for gnome, adjust if need for other desktop
send_key 'alt-f10' if $args{maximize_window};
Copy link
Member

Choose a reason for hiding this comment

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

Please update POD. What do we need this feature for? I assume because of the potentially long list of modules which should all fit but even in this case you can not be sure all is shown so does it really help?

Copy link
Member Author

Choose a reason for hiding this comment

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

As of now it fits and that's why I've added here. We use same method for this test which is used for the registration during installation. So verifying that modules are pre-selected by single modules is not supported.

sub test_setup {
select_console 'root-console';
if (sle_version_at_least '15') {
prepare_reg_sle15;
Copy link
Member

Choose a reason for hiding this comment

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

so this will still be called for SLE16 but calls a function "reg_sle15"? Somehow does not fit nicely. Better call the functions with a name reflecting what they really do

@rwx788 rwx788 force-pushed the 29423_registartion branch 2 times, most recently from bda4b65 to 89f1e42 Compare February 21, 2018 11:43
@rwx788
Copy link
Member Author

rwx788 commented Feb 26, 2018

@okurz anything else here, or we can merge?

sub define_proxy_scc_for_addons {


}
Copy link
Contributor

Choose a reason for hiding this comment

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

nothing in sub

Copy link
Member Author

Choose a reason for hiding this comment

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

I moved those inline, thanks!


sub clean_registration_define_proxy_scc_for_all {

}
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above, still in wip?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed. Thanks

The main issue here was that we use already registered image.
Nevertheless, we can simply clean registration data and perform clean
registration again.

See [poo#29423](https://progress.opensuse.org/issues/29423).
@okurz okurz merged commit 3fda2b1 into os-autoinst:master Feb 27, 2018
@rwx788 rwx788 deleted the 29423_registartion branch May 9, 2018 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants