Merge pull request #9115 from StefanBruens/debug_change_password

Do not expect a display manager when AUTOLOGIN is active
os-autoinst · Dec 10, 2019 · b4cc556 · b4cc556
2 parents 6bbed36 + af0727b
commit b4cc556
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tests/x11/gnomecase/change_password.pm b/tests/x11/gnomecase/change_password.pm
@@ -58,16 +58,18 @@ sub logout_and_login {
 sub reboot_system {
     my ($self) = @_;
     reboot_x11;
-    $self->{await_reboot} = 1;
-    $self->wait_boot(nologin => 1);
     if (check_var('NOAUTOLOGIN', 1)) {
+        $self->{await_reboot} = 1;
+        $self->wait_boot(nologin => 1);
         assert_screen "displaymanager", 200;
         $self->{await_reboot} = 0;
         # The keyboard focus is different between SLE15 and SLE12
         send_key 'up' if is_sle('15+');
         send_key "ret";
         wait_still_screen;
         type_string "$newpwd\n";
+    } else {
+        $self->wait_boot();
     }
     assert_screen "generic-desktop";
 }