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 tests for Welcome screen depending on product #6056

Merged
merged 3 commits into from
Oct 26, 2018

Conversation

OleksandrOrlov
Copy link
Contributor

@OleksandrOrlov OleksandrOrlov commented Oct 25, 2018

Starting with SLE 15, all products are distributed using one medium, and Product
to install has to be chosen explicitly.

Though, there are some exceptions (like s390x) when there is only one Product,
so that License agreement is shown directly, skipping the Product selection step.
Also, Product Selection screen is not shown during upgrade.

The commit allows more clearly identify if the product has license on
Welcome screen, or it has Product Selection step. Also, it removes
unnecessary calls of keyboard_selection module as it should only be
called for some specific test suites.

SLE15:

SLE12:

UPGRADE:

OPENSUSE:

Oleksandr Orlov added 2 commits October 25, 2018 15:01
The commit adds two functions: one for identifying cases when installer
has to show Product Selection screen before the License Agreement and
the second to identify cases when License has to be shown on Welcome
screen.

The functions are added, because different SLE versions show the License
Agreement on diferent pages.

Made in scope of [poo#42608](https://progress.opensuse.org/issues/42608)
Accept License logic and explicit check that license has to be accepted
are divided into two separate methods.

This allows to have more flexible control of the test and make the
additional check only in case of extended test suite.

[poo#42608](https://progress.opensuse.org/issues/42608)
lib/version_utils.pm Outdated Show resolved Hide resolved
tests/installation/keyboard_selection.pm Show resolved Hide resolved
Starting with SLE 15, all products are distributed using one medium, and Product
to install has to be chosen explicitly.

Though, there are some exceptions (like s390x) when there is only one Product,
so that License agreement is shown directly, skipping the Product selection step.
Also, Product Selection screen is not shown during upgrade.

The commit allows to more clearly identify if the product has license on
Welcome screen, or it has Product Selection step. Also, it removes
unnecessary calls of keyboard_selection module as it should only be
called for some specific test suites.

[poo#42608](https://progress.opensuse.org/issues/42608)
@rwx788
Copy link
Member

rwx788 commented Oct 25, 2018

@okurz @alice-suse @dzedro we plan to merge this PR tomorrow in the morning. It touches modules that are used in every installation, so may break something. In this case, we will simply revert, but would be great if you could take a look.

Copy link
Member

@okurz okurz left a comment

Choose a reason for hiding this comment

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

Looks big but great :)

@OleksandrOrlov OleksandrOrlov changed the title 42608 license acceptance Adjust tests for Welcome screen depending on product Oct 25, 2018
@rwx788 rwx788 merged commit ca8db93 into os-autoinst:master Oct 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants