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 new ServiceWidget - y2proxy & y2http #5628

Merged
merged 1 commit into from Aug 24, 2018

Conversation

jknphy
Copy link
Contributor

@jknphy jknphy commented Aug 23, 2018

Adapt new ServiceWidget - yast2_proxy and yast2_http taking into account that Leap 15.1 recently received it as we can see here. I also would like to provide some refactor.

@jknphy
Copy link
Contributor Author

jknphy commented Aug 23, 2018

AFIK dev progresses in parallel regarding sle 15 and leap15, the only doubt that I have is if <=15.0 or <15.0

@jknphy jknphy changed the title Add new ServiceWidget to Leap Add new ServiceWidget to Leap 15.1 Aug 23, 2018
@jknphy jknphy changed the title Add new ServiceWidget to Leap 15.1 Add new ServiceWidget to Leap 15.1 - yast2_proxy Aug 23, 2018
@jknphy jknphy changed the title Add new ServiceWidget to Leap 15.1 - yast2_proxy PR - Adapt new ServiceWidget - y2proxy & y2http Aug 23, 2018
@jknphy jknphy changed the title PR - Adapt new ServiceWidget - y2proxy & y2http Adapt new ServiceWidget - y2proxy & y2http Aug 23, 2018
@jknphy jknphy changed the title Adapt new ServiceWidget - y2proxy & y2http [WIP] Adapt new ServiceWidget - y2proxy & y2http Aug 23, 2018
@@ -102,7 +102,7 @@ sub run {
assert_screen 'http_vitual_host_page'; # check wizard page (4/5)
send_key 'alt-n'; # go to http server wizard (5/5) --summary
# make sure that apache2 server got started when booting
if ((is_sle '<15') || (is_leap)) {
if (is_sle('<15') || is_leap('<15.0')) {
Copy link
Member

Choose a reason for hiding this comment

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

It's alright to keep original version as we execute this test against latest products only. But if we want to be strict it should be <15.1 then, as 15.0 will get these changes as updates only.

@jknphy jknphy force-pushed the new_widget_leap branch 3 times, most recently from d11a1a2 to 759c6b8 Compare August 24, 2018 07:13
@jknphy jknphy changed the title [WIP] Adapt new ServiceWidget - y2proxy & y2http Adapt new ServiceWidget - y2proxy & y2http Aug 24, 2018
send_key_until_needlematch 'yast2_ncurses_service_start_widget_start_on_boot', 'up';
send_key 'ret';
assert_screen 'yast2_ncurses_service_start_widget_check_start_on_boot';
$self->SUPER::assert_service_widget(after_writing_conf => 'alt-w', after_reboot => 'alt-e');
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need SUPER here, as you don't override method in inherited class.

send_key_until_needlematch 'yast2_ncurses_service_start_widget_start_on_boot', 'up';
send_key 'ret';
assert_screen 'yast2_ncurses_service_start_widget_check_start_on_boot';
$self->SUPER::assert_service_widget;
Copy link
Member

Choose a reason for hiding this comment

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

Same here

@rwx788 rwx788 merged commit 715c3fe into os-autoinst:master Aug 24, 2018
@jknphy jknphy deleted the new_widget_leap branch September 7, 2018 11:12
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