Merge pull request #16068 from zhaocongjia/poo121477

x11/remote_desktop: no need to run 'dhclient'
os-autoinst · Dec 8, 2022 · 75920df · 75920df
2 parents e83237b + d4a0712
commit 75920df
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 41 deletions.
diff --git a/tests/x11/remote_desktop/onetime_vncsession_multilogin_failed.pm b/tests/x11/remote_desktop/onetime_vncsession_multilogin_failed.pm
@@ -1,7 +1,7 @@
 # Copyright 2017-2019 SUSE LLC
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Package: tigervnc dhcp-client
+# Package: tigervnc
 # Summary: Remote Login: One-time VNC Session failed due to a previous graphical session
 # Maintainer: Grace Wang <grace.wang@suse.com>
 # Tags: tc#1586208
@@ -32,13 +32,6 @@ sub run {
     mutex_unlock 'dhcp';
     mutex_lock 'xvnc';
 
-    # Make sure the client gets the IP address
-    x11_start_program('xterm');
-    become_root;
-    assert_script_run 'dhclient';
-    enter_cmd "exit";
-    wait_screen_change { send_key 'alt-f4'; };
-
     # Setup the first remote connection and minimize the vncviewer
     $self->start_vncviewer;
     handle_login;

diff --git a/tests/x11/remote_desktop/onetime_vncsession_xvnc_remmina.pm b/tests/x11/remote_desktop/onetime_vncsession_xvnc_remmina.pm
@@ -3,7 +3,7 @@
 # Copyright 2018-2020 SUSE LLC
 # SPDX-License-Identifier: FSFAP
 #
-# Package: dhcp-client remmina
+# Package: remmina
 # Summary: Remote Login: One-time VNC Session with remmina and xvnc
 # Maintainer: Grace Wang <grace.wang@suse.com>
 # Tags: tc#1610354
@@ -22,13 +22,6 @@ sub run {
     mutex_unlock 'dhcp';
     mutex_lock 'xvnc';
 
-    # Make sure the client gets the IP address
-    x11_start_program('xterm');
-    become_root;
-    assert_script_run 'dhclient';
-    enter_cmd "exit";
-    send_key 'alt-f4';
-
     # Start Remmina and login the remote server
     x11_start_program('remmina', target_match => 'remmina-launched');
     # The remmmina news turned off screen appears since the remmina got updated in 15SP3

diff --git a/tests/x11/remote_desktop/onetime_vncsession_xvnc_tigervnc.pm b/tests/x11/remote_desktop/onetime_vncsession_xvnc_tigervnc.pm
@@ -1,7 +1,7 @@
 # Copyright 2017-2019 SUSE LLC
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Package: dhcp-client tigervnc gnome-terminal nautilus
+# Package: tigervnc gnome-terminal nautilus
 # Summary: Remote Login: One-time VNC Session with tigervnc and xvnc
 # Maintainer: Grace Wang <grace.wang@suse.com>
 # Tags: tc#1586206
@@ -19,13 +19,6 @@ sub run {
     mutex_unlock 'dhcp';
     mutex_lock 'xvnc';
 
-    # Make sure the client gets the IP address
-    x11_start_program('xterm');
-    become_root;
-    assert_script_run 'dhclient';
-    enter_cmd "exit";
-    send_key 'alt-f4';
-
     # Start vncviewer and login with fullscreen
     x11_start_program('vncviewer', target_match => 'vnc_password_dialog');
     type_string '10.0.2.1:1';

diff --git a/tests/x11/remote_desktop/persistent_vncsession_xvnc.pm b/tests/x11/remote_desktop/persistent_vncsession_xvnc.pm
@@ -1,7 +1,7 @@
 # Copyright 2017-2019 SUSE LLC
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Package: tigervnc dhcp-client
+# Package: tigervnc
 # Summary: Remote Login: Persistent VNC Session with tigervnc and xvnc
 # Maintainer: Grace Wang <grace.wang@suse.com>
 # Tags: tc#1586209
@@ -47,13 +47,6 @@ sub run {
     mutex_unlock 'dhcp';
     mutex_lock 'xvnc';
 
-    # Make sure the client gets the IP address
-    x11_start_program('xterm');
-    become_root;
-    assert_script_run 'dhclient';
-    enter_cmd "exit";
-    send_key 'alt-f4';
-
     # First time login and configure the visibility
     $self->start_vncviewer;
     handle_login;

diff --git a/tests/x11/remote_desktop/x11_forwarding_openssh.pm b/tests/x11/remote_desktop/x11_forwarding_openssh.pm
@@ -1,7 +1,7 @@
 # Copyright 2017 SUSE LLC
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Package: dhcp-client openssh gedit gnome-control-center
+# Package: openssh gedit gnome-control-center
 # Summary: Remote Login: X11 forwarding over OpenSSH
 # Maintainer: Grace Wang <grace.wang@suse.com>
 # Tags: tc#1586202
@@ -23,11 +23,7 @@ sub run {
     mutex_lock 'ssh';
     mutex_unlock 'ssh';
 
-    # Make sure the client gets the IP address
     x11_start_program('xterm');
-    become_root;
-    assert_script_run 'dhclient';
-    enter_cmd "exit";
 
     # ssh login
     my $str = 'SSH-' . time;

diff --git a/tests/x11/remote_desktop/xdmcp_gdm.pm b/tests/x11/remote_desktop/xdmcp_gdm.pm
@@ -1,7 +1,7 @@
 # Copyright 2017 SUSE LLC
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Package: dhcp-client xorg-x11-server-extra
+# Package: xorg-x11-server-extra
 # Summary: Remote Login: XDMCP with gdm and GNOME session configured
 # Maintainer: Grace Wang <grace.wang@suse.com>
 # Tags: tc#1586203
@@ -26,7 +26,6 @@ sub run {
     # Make sure the client gets the IP address and configure the firewall
     x11_start_program('xterm');
     become_root;
-    assert_script_run 'dhclient';
     $self->configure_xdmcp_firewall;
     enter_cmd "exit";
 

diff --git a/tests/x11/remote_desktop/xdmcp_xdm.pm b/tests/x11/remote_desktop/xdmcp_xdm.pm
@@ -1,7 +1,7 @@
 # Copyright 2017 SUSE LLC
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Package: dhcp-client xorg-x11-server-extra
+# Package: xorg-x11-server-extra
 # Summary: Remote Login: XDMCP with xdm and icewm configured
 # Maintainer: Grace Wang <grace.wang@suse.com>
 # Tags: tc#1586204
@@ -24,7 +24,6 @@ sub run {
     # Make sure the client gets the IP address and configure the firewall
     x11_start_program('xterm');
     become_root;
-    assert_script_run 'dhclient';
     $self->configure_xdmcp_firewall;
     enter_cmd "exit";