From 63c8d117fc9c6d35620479f2dbe43e277e5f8c41 Mon Sep 17 00:00:00 2001
From: openQA web UI <openqa@yutao-qe1>
Date: Thu, 16 Nov 2023 10:49:33 +0800
Subject: [PATCH] Change to use serial_terminal for scc_deregistration

---
 lib/utils.pm                        | 2 +-
 tests/console/scc_deregistration.pm | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/utils.pm b/lib/utils.pm
index a1c9bb14053b..c88019657f14 100644
--- 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
index eeb741fca686..6793330d63b9 100644
--- 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;
 }