From 34dc2751a5d5bd09e2bbe147051a2b54f0713d78 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 2 Jan 2020 17:44:45 -0800 Subject: [PATCH] Replace remaining wait_idles with sleeps wait_idle is finally removed upstream in recent git os-autoinst. This replaces all remaining wait_idles with sleeps, except for one which is removed (I'm hoping improvements to typing in the last few years should mean it isn't necessary any more, if it turns out to be, I'll put it back as a sleep). Signed-off-by: Adam Williamson --- lib/fedoradistribution.pm | 2 +- lib/packagetest.pm | 3 --- tests/disk_guided_encrypted.pm | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/fedoradistribution.pm b/lib/fedoradistribution.pm index cc83c53f..edf55ac0 100644 --- a/lib/fedoradistribution.pm +++ b/lib/fedoradistribution.pm @@ -38,7 +38,7 @@ sub x11_start_program { send_key "alt-f2"; assert_screen "desktop_runner"; type_string $program, 20; - wait_idle 5; # because of KDE dialog - SUSE guys are doing the same! + sleep 5; # because of KDE dialog - SUSE guys are doing the same! send_key "ret", 1; } diff --git a/lib/packagetest.pm b/lib/packagetest.pm index 7892bdfe..ae4cc525 100644 --- a/lib/packagetest.pm +++ b/lib/packagetest.pm @@ -14,9 +14,6 @@ sub prepare_test_packages { # remove python3-kickstart if installed (we don't use assert # here in case it's not) script_run 'dnf -y remove python3-kickstart', 180; - # we seem to often lose keystrokes in the next command if we run - # it too fast, let's wait for idle first - wait_idle 20; # grab the test repo definitions assert_script_run 'curl -o /etc/yum.repos.d/openqa-testrepo-1.repo https://fedorapeople.org/groups/qa/openqa-repos/openqa-testrepo-1.repo'; # install the test packages from repo1 diff --git a/tests/disk_guided_encrypted.pm b/tests/disk_guided_encrypted.pm index f5903948..d5768cd2 100644 --- a/tests/disk_guided_encrypted.pm +++ b/tests/disk_guided_encrypted.pm @@ -15,7 +15,7 @@ sub run { assert_and_click "anaconda_spoke_done"; # type password for disk encryption - wait_idle 5; + sleep 5; if (get_var("SWITCHED_LAYOUT")) { desktop_switch_layout "ascii", "anaconda"; }