tests/remote_desktop_client.pm

@@ -3,50 +3,11 @@ use strict;
 use testapi;
 use utils;
 
-# This test uses a Connections application to establish an
-# RDP connection to a remote computer running Gnome Workstation.
-
 sub run {
     my $self = shift;
-    my $user = "";
-    my $password = "";
-    my $ip = "";
 
-    # Switch to console and perform settings.
+    boot_to_login_screen(timeout => 300);
     $self->root_console(tty => 3);
-    assert_script_run("hostnamectl set-hostname pawn");
-
-    # Return to the desktop
-    desktop_vt();
-
-    # Open the Connections and start the connection.
-    menu_launch_type("connections");
-    wait_still_screen(3)
-    assert_screen("connections_runs");
-    assert_and_click("connections_add_connection");
-    type_very_safely($ip);
-    assert_and_click("gnome_button_connect")
-
-    # Log onto the system.
-    assert_screen("connection_authorization");
-    assert_and_click("connection_namefield");
-    type_very_safely($user);
-    send_key("tab");
-    send_key("tab");
-    type_very_safely($password);
-    assert_and_click("connection_authenticate");
-    wait_still_screen(3);
-    send_key("ret");
-    type_very_safely("$syspw\n");
-    wait_still_screen(2);
-
-    # Start the terminal
-    type_very_safely("terminal\n");
-    wait_still_screen(3);
-
-    # Check that we are on the correct computer.
-    # We can tell from the terminal prompt.
-    assert_screen("freerdp_desktop_connected");
 }
 
 sub test_flags {

tests/remote_desktop_freerdp.pm

@@ -22,25 +22,17 @@ sub run {
 
     # Open terminal and make a connection to the remote server.
     menu_launch_type("terminal");
-    wait_still_screen(3);
+    wait_still_screen(2);
     enter_cmd("xfreerdp /:u $user /:p $password /:v $ip");
     
     # Check that a connection window has appeared.
-    assert_screen("connection_window");
+    assert_screen("freerdp_connection_window");
     
-    # Log onto the system.
-    assert_and_check("connection_login_screen");
+    # Perform login, start terminal and check the hostname.
+    assert_and_check("freerdp_login_screen");
     send_key("ret");
     sleep(2);
-    type_very_safely("$syspw\n");
-    wait_still_screen(2);
-
-    # Start the terminal
-    type_very_safely("terminal\n");
-    wait_still_screen(3);
-
-    # Check that we are on the correct computer.
-    # We can tell from the terminal prompt.
+    type_very_safely($syspw);
     assert_screen("freerdp_desktop_connected");
 }