From b81caf322a5e27673337efa20686d6ca782f86ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20R=C5=AF=C5=BEi=C4=8Dka?= Date: Wed, 20 Nov 2024 11:29:22 +0100 Subject: [PATCH] Make sure, the variables are filled correctly. --- templates.fif.json | 4 ++-- tests/remote_desktop_freerdp.pm | 11 ++++++----- tests/remote_desktop_server.pm | 8 +++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/templates.fif.json b/templates.fif.json index 55317b76..f7912715 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -2524,7 +2524,7 @@ "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "NICTYPE": "tap", "POSTINSTALL": "remote_desktop_server", - "POST_STATIC": "172.16.2.107 king.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.107 kaermorhen.test.openqa.fedoraproject.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "WORKER_CLASS": "tap" @@ -2540,7 +2540,7 @@ "NICTYPE": "tap", "POSTINSTALL": "remote_desktop_client", "PARALLEL_WITH": "remote_desktop_server", - "POST_STATIC": "172.16.2.108 pawn.test.openqa.fedoraproject.org", + "POST_STATIC": "172.16.2.108 witcher.test.openqa.fedoraproject.org", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%", "WORKER_CLASS": "tap" diff --git a/tests/remote_desktop_freerdp.pm b/tests/remote_desktop_freerdp.pm index 8570f8c3..e47286f1 100644 --- a/tests/remote_desktop_freerdp.pm +++ b/tests/remote_desktop_freerdp.pm @@ -8,13 +8,14 @@ use utils; sub run { my $self = shift; - my $user = ""; - my $password = ""; - my $ip = ""; + my $rdpuser = "geralt"; + my $rdppass = "ciriofcintra"; + my $ip = "172.16.2.107"; + my $password = get_var("USER_PASSWORD", "weakpassword"); # Switch to console and install the necessary packages. $self->root_console(tty => 3); - assert_script_run("hostnamectl set-hostname pawn"); + assert_script_run("hostnamectl set-hostname witcher"); assert_script_run("dnf install -y freerdp", timeout => 60); # Return to the desktop @@ -32,7 +33,7 @@ sub run { assert_and_check("connection_login_screen"); send_key("ret"); sleep(2); - type_very_safely("$syspw\n"); + type_very_safely("$password\n"); wait_still_screen(2); # Start the terminal diff --git a/tests/remote_desktop_server.pm b/tests/remote_desktop_server.pm index 306ceed2..72436086 100644 --- a/tests/remote_desktop_server.pm +++ b/tests/remote_desktop_server.pm @@ -7,6 +7,8 @@ sub run { my $self = shift; my $user = get_var("USER_LOGIN", "test"); my $password = get_var("USER_PASSWORD", "weakpassword"); + my $rdpuser = "geralt"; + my $rdppass = "ciriofcintra"; $self->root_console(tty => 3); # Make necessary settings for the RDP server. @@ -21,7 +23,7 @@ sub run { # Let's also change the hostname so that we can # differentiate later. - assert_script_run("hostnamectl set-hostname king"); + assert_script_run("hostnamectl set-hostname kaermorhen"); # Change to Desktop desktop_vt(); @@ -46,9 +48,9 @@ sub run { assert_and_click("settings_switch_remote"); wait_still_screen(3); assert_and_click("settings_remote_username"); - type_very_safely("remotee"); + type_very_safely($rdpuser); assert_and_click("settings_remote_password"); - type_very_safely("opensesame"); + type_very_safely($rdppass); assert_and_click("gnome_reveil_password"); wait_still_screen(3); send_key("alt-f4");