diff --git a/0001-Slower-default-typing-speed.patch b/0001-Slower-default-typing-speed.patch deleted file mode 100644 index 81a1d0d..0000000 --- a/0001-Slower-default-typing-speed.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 8115d074e974e815a20a0e426a5ffb0b43a1a4c9 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 15 Aug 2017 10:48:43 -0700 -Subject: [PATCH] Slower default typing speed - -Suddenly Fedora tests are failing all over the place with typing -errors. I have no idea why, but slowing down typing will, I -hope!, work around the problem for now. ---- - t/03-testapi.t | 12 ++++++------ - testapi.pm | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/t/03-testapi.t b/t/03-testapi.t -index 1cc75de..7dc5d82 100755 ---- a/t/03-testapi.t -+++ b/t/03-testapi.t -@@ -76,7 +76,7 @@ sub fake_wait_screen_change(&@) { - $mod2->mock(wait_screen_change => \&fake_wait_screen_change); - - type_string 'hallo'; --is_deeply($cmds, [{cmd => 'backend_type_string', max_interval => 250, text => 'hallo'}]); -+is_deeply($cmds, [{cmd => 'backend_type_string', max_interval => 150, text => 'hallo'}]); - $cmds = []; - - type_string 'hallo', 4; -@@ -84,7 +84,7 @@ is_deeply($cmds, [{cmd => 'backend_type_string', max_interval => 4, text => 'hal - $cmds = []; - - type_string 'hallo', secret => 1; --is_deeply($cmds, [{cmd => 'backend_type_string', max_interval => 250, text => 'hallo'}]); -+is_deeply($cmds, [{cmd => 'backend_type_string', max_interval => 150, text => 'hallo'}]); - $cmds = []; - - type_string 'hallo', secret => 1, max_interval => 10; -@@ -92,16 +92,16 @@ is_deeply($cmds, [{cmd => 'backend_type_string', max_interval => 10, text => 'ha - $cmds = []; - - type_string 'hallo', wait_screen_change => 3; --is_deeply($cmds, [{cmd => 'backend_type_string', max_interval => 250, text => 'hal'}, {cmd => 'backend_type_string', max_interval => 250, text => 'lo'},]); -+is_deeply($cmds, [{cmd => 'backend_type_string', max_interval => 150, text => 'hal'}, {cmd => 'backend_type_string', max_interval => 150, text => 'lo'},]); - $cmds = []; - - type_string 'hallo', wait_screen_change => 2; - is_deeply( - $cmds, - [ -- {cmd => 'backend_type_string', max_interval => 250, text => 'ha'}, -- {cmd => 'backend_type_string', max_interval => 250, text => 'll'}, -- {cmd => 'backend_type_string', max_interval => 250, text => 'o'}, -+ {cmd => 'backend_type_string', max_interval => 150, text => 'ha'}, -+ {cmd => 'backend_type_string', max_interval => 150, text => 'll'}, -+ {cmd => 'backend_type_string', max_interval => 150, text => 'o'}, - ]); - $cmds = []; - -diff --git a/testapi.pm b/testapi.pm -index eabc411..2616e16 100755 ---- a/testapi.pm -+++ b/testapi.pm -@@ -1121,7 +1121,7 @@ sub type_string { - return; - } - -- my $max_interval = $args{max_interval} // 250; -+ my $max_interval = $args{max_interval} // 150; - my $wait = $args{wait_screen_change} // 0; - bmwqemu::log_call(string => $log, max_interval => $max_interval, wait_screen_changes => $wait); - if ($wait) { --- -2.14.1 - diff --git a/os-autoinst.spec b/os-autoinst.spec index 5028ded..691a1a7 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -40,23 +40,16 @@ Name: os-autoinst Version: %{github_version} -Release: 24%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 25%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ Group: Development/System URL: https://os-autoinst.github.io/openQA/ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz # Type the long text string a bit slower in the full stack test -# This isn't really upstreamable, it's just a workaround to make the -# test fail less often particularly in Rawhide builds; typing very -# long strings isn't 100% reliable it seems +# This is basically working around RHBZ #1481858, I believe; when +# that's fixed in qemu we can probably drop it Patch0: 0001-Type-a-bit-slower-in-the-full_stack-test.patch -# Also type slower in actual use, because suddenly tests are failing -# due to typing errors all over the place and I just cannot figure -# out why this has suddenly started happening. Not upstreamable, this -# is just a workaround until we fix the problem or it goes away...I -# hope. -Patch1: 0001-Slower-default-typing-speed.patch BuildRequires: autoconf BuildRequires: automake @@ -233,6 +226,9 @@ make check VERBOSE=1 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf %changelog +* Tue Aug 15 2017 Adam Williamson - 4.4-25.20170725git734682a +- Revert typing speed change, didn't help and we found the real bug + * Tue Aug 15 2017 Adam Williamson - 4.4-24.20170725git734682a - Make the default typing speed slower to work around typing fails