Merge pull request os-autoinst#18152 from tinawang123/sccdereg

Change to use serial_terminal for scc_deregistration
pablo-herranz · Nov 22, 2023 · c51c095 · c51c095
2 parents 409ac33 + 63c8d11
commit c51c095
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/utils.pm b/lib/utils.pm
@@ -1266,7 +1266,7 @@ This is needed to prevent access conflicts to the RPM database.
 =cut
 
 sub quit_packagekit {
-    script_run("systemctl mask packagekit; systemctl stop packagekit; while pgrep packagekitd; do sleep 1; done");
+    script_run("systemctl mask packagekit; systemctl stop packagekit; while pgrep packagekitd; do sleep 1; done", timeout => 60);
 }
 
 =head2 wait_for_purge_kernels

diff --git a/tests/console/scc_deregistration.pm b/tests/console/scc_deregistration.pm
@@ -9,11 +9,12 @@ use warnings;
 use base "consoletest";
 use testapi;
 use registration "scc_deregistration";
+use serial_terminal 'select_serial_terminal';
 
 sub run {
     return unless (get_var('SCC_REGISTER') || get_var('HDD_SCC_REGISTERED'));
 
-    select_console 'root-console';
+    select_serial_terminal;
     scc_deregistration;
 }