From 4a57d5c9874722fa69e9d115cc2194ad7748c67f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 20 Jul 2017 18:29:47 -0700 Subject: [PATCH] Patch the full-stack test to type a bit slower It fails quite often on Rawhide; this should make it pass more reliably. --- ...-a-bit-slower-in-the-full_stack-test.patch | 28 +++++++++++++++++++ os-autoinst.spec | 6 ++++ 2 files changed, 34 insertions(+) create mode 100644 0001-Type-a-bit-slower-in-the-full_stack-test.patch diff --git a/0001-Type-a-bit-slower-in-the-full_stack-test.patch b/0001-Type-a-bit-slower-in-the-full_stack-test.patch new file mode 100644 index 0000000..ab40756 --- /dev/null +++ b/0001-Type-a-bit-slower-in-the-full_stack-test.patch @@ -0,0 +1,28 @@ +From 76a8d7dd04c63ab3d0308ca01564bffd305452fa Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 20 Jul 2017 18:15:01 -0700 +Subject: [PATCH] Type a bit slower in the full_stack test + +Seems like this console typing often fails to be perfect on +Rawhide, and we can't really do a lot about it. So let's just +slow it down to try and make the test pass more reliably. +--- + t/data/tests/tests/boot.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/data/tests/tests/boot.pm b/t/data/tests/tests/boot.pm +index 646c162..9b82b8f 100644 +--- a/t/data/tests/tests/boot.pm ++++ b/t/data/tests/tests/boot.pm +@@ -45,7 +45,7 @@ RFB found a second and more enduring use when VNC was developed. VNC was release + When ORL was closed in 2002 some of the key people behind VNC and RFB formed [[RealVNC]], Ltd., in order to continue development of VNC and to maintain the RFB protocol. The current RFB protocol is published on the RealVNC website. + END + +- type_string $text; ++ type_string $text, max_interval => 150; + type_string "\nEOF\n"; + script_run "echo '924095f2cb4d622a8796de66a5e0a44a text' > text.md5"; + assert_script_run 'md5sum -c text.md5'; +-- +2.13.0 + diff --git a/os-autoinst.spec b/os-autoinst.spec index 0b48a70..4d409f4 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -49,6 +49,11 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith # https://github.com/os-autoinst/os-autoinst/pull/820 # Fix build on Perl 5.26.0, where . is not in INC by default Patch0: os-autoinst-Fix-building-on-Perl-without-dot-in-INC.patch +# 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 +Patch1: 0001-Type-a-bit-slower-in-the-full_stack-test.patch BuildRequires: autoconf BuildRequires: automake @@ -223,6 +228,7 @@ make check VERBOSE=1 %changelog * Thu Jul 20 2017 Adam Williamson - 4.4-20.20170410git97928a2 - Rebuild for new gdal (for new mariadb) +- Downstream patch the full-stack test to type a bit slower * Tue Jun 06 2017 Jitka Plesnikova - 4.4-19.20170410git97928a2 - Perl 5.26 rebuild