From 384b4377fa69f0971e7e278fb3782bea54e086c1 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 17 Jun 2020 16:34:30 -0700 Subject: [PATCH] base_service_manipulation: use chronyd not sshd We changed the wiki test case this way, and it should work better on Cloud images. Signed-off-by: Adam Williamson --- tests/base_service_manipulation.pm | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/base_service_manipulation.pm b/tests/base_service_manipulation.pm index 4341949c..d7ca8b06 100644 --- a/tests/base_service_manipulation.pm +++ b/tests/base_service_manipulation.pm @@ -7,43 +7,43 @@ sub run { my $self = shift; # switch to TTY3 for both, graphical and console tests $self->root_console(tty=>3); - # we could make this slightly more 'efficient' by assuming sshd + # we could make this slightly more 'efficient' by assuming chronyd # is always going to be enabled/running at first, but it's safer # to force an expected starting state. - script_run "systemctl stop sshd.service"; - script_run "systemctl disable sshd.service"; + script_run "systemctl stop chronyd.service"; + script_run "systemctl disable chronyd.service"; script_run "reboot", 0; boot_to_login_screen; $self->root_console(tty=>3); # note the use of ! here is a bash-ism, but it sure makes life easier - assert_script_run '! systemctl is-enabled sshd.service'; - assert_script_run '! systemctl is-active sshd.service'; - assert_script_run '! ps -C sshd'; - script_run "systemctl start sshd.service"; - assert_script_run '! systemctl is-enabled sshd.service'; - assert_script_run 'systemctl is-active sshd.service'; - assert_script_run 'ps -C sshd'; - script_run "systemctl stop sshd.service"; - assert_script_run '! systemctl is-enabled sshd.service'; - assert_script_run '! systemctl is-active sshd.service'; - assert_script_run '! ps -C sshd'; - script_run "systemctl enable sshd.service"; - assert_script_run 'systemctl is-enabled sshd.service'; - assert_script_run '! systemctl is-active sshd.service'; - assert_script_run '! ps -C sshd'; + assert_script_run '! systemctl is-enabled chronyd.service'; + assert_script_run '! systemctl is-active chronyd.service'; + assert_script_run '! ps -C chronyd'; + script_run "systemctl start chronyd.service"; + assert_script_run '! systemctl is-enabled chronyd.service'; + assert_script_run 'systemctl is-active chronyd.service'; + assert_script_run 'ps -C chronyd'; + script_run "systemctl stop chronyd.service"; + assert_script_run '! systemctl is-enabled chronyd.service'; + assert_script_run '! systemctl is-active chronyd.service'; + assert_script_run '! ps -C chronyd'; + script_run "systemctl enable chronyd.service"; + assert_script_run 'systemctl is-enabled chronyd.service'; + assert_script_run '! systemctl is-active chronyd.service'; + assert_script_run '! ps -C chronyd'; script_run "reboot", 0; boot_to_login_screen; $self->root_console(tty=>3); - assert_script_run 'systemctl is-enabled sshd.service'; - assert_script_run 'systemctl is-active sshd.service'; - assert_script_run 'ps -C sshd'; - script_run "systemctl disable sshd.service"; + assert_script_run 'systemctl is-enabled chronyd.service'; + assert_script_run 'systemctl is-active chronyd.service'; + assert_script_run 'ps -C chronyd'; + script_run "systemctl disable chronyd.service"; script_run "reboot", 0; boot_to_login_screen; $self->root_console(tty=>3); - assert_script_run '! systemctl is-enabled sshd.service'; - assert_script_run '! systemctl is-active sshd.service'; - assert_script_run '! ps -C sshd'; + assert_script_run '! systemctl is-enabled chronyd.service'; + assert_script_run '! systemctl is-active chronyd.service'; + assert_script_run '! ps -C chronyd'; }