Update patches

Signed-off-by: Adam Williamson <awilliam@redhat.com>

0001-18-qemu-options.t-drop-some-fragile-and-unnecessary-.patch

@@ -0,0 +1,33 @@
+From 2cef27f5bfd2ff9c415b74b2299cbf44f80975f4 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Wed, 25 May 2022 14:46:08 -0700
+Subject: [PATCH 2/2] 18-qemu-options.t: drop some fragile and unnecessary
+ asserts
+
+It's really not our job to test exactly what qemu does when we
+call it with `-M ? -version`, and that behaviour seems to vary
+anyhow, so let's drop these.
+
+https://progress.opensuse.org/issues/111602
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ t/18-qemu-options.t | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/t/18-qemu-options.t b/t/18-qemu-options.t
+index 4ef4a015..80fcd797 100755
+--- a/t/18-qemu-options.t
++++ b/t/18-qemu-options.t
+@@ -74,8 +74,6 @@ subtest qemu_append_option => sub {
+     run_isotovideo(@common_options, QEMU_APPEND => 'M ? -version');
+     like($log, qr/-M \?/, '-M ? option added');
+     like($log, qr/-version/, '-version option added');
+-    like($log, qr/QEMU emulator version/, 'QEMU version printed');
+-    unlike($log, qr/Supported machines are\:/, 'Supported machines not listed');
+     unlike($log, qr/\: invalid option/, 'no invalid option detected');
+     like($log, qr/QEMU terminated before QMP connection could be established/, 'connecting to QMP socket aborted');
+     $ENV{QEMU_QMP_CONNECT_ATTEMPTS} = $qmp_connect_attempts;
+-- 
+2.36.1
+

0001-NOT-UPSTREAMABLE-Disable-unreliable-stdout-stderr-ch.patch

@@ -1,56 +0,0 @@
-From 2a65d73dc1f90d8606c318cefaf6e3a8eddfd50e Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Thu, 3 Feb 2022 12:27:17 -0800
-Subject: [PATCH] NOT UPSTREAMABLE: Disable unreliable stdout/stderr checks
-
-This is intended for package build environments only. It disables
-some stdout/stderr checks which seem to be unreliable in package
-builds for as-yet unknown reasons:
-
-https://progress.opensuse.org/issues/60755
-https://progress.opensuse.org/issues/105061
-
-Signed-off-by: Adam Williamson <awilliam@redhat.com>
----
- t/07-commands.t       | 2 +-
- t/29-backend-driver.t | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/t/07-commands.t b/t/07-commands.t
-index de9bcd7f..c356de3b 100755
---- a/t/07-commands.t
-+++ b/t/07-commands.t
-@@ -216,7 +216,7 @@ subtest 'upload api' => sub {
- 
- kill TERM => $spid;
- waitpid($spid, 0);
--combined_like { eval { $cserver->stop() } } qr/commands process exited/, 'commands server stopped';
-+eval { $cserver->stop() };
- 
- done_testing;
- 
-diff --git a/t/29-backend-driver.t b/t/29-backend-driver.t
-index 6738ced3..d040e616 100755
---- a/t/29-backend-driver.t
-+++ b/t/29-backend-driver.t
-@@ -21,14 +21,14 @@ chdir $dir;
- my $cleanup = scope_guard sub { chdir $Bin; undef $dir };
- 
- my $driver;
--combined_like { $driver = backend::driver->new('null') } qr/(Blocking SIGCHLD|channel_out)/, 'log output for backend driver creation';
-+$driver = backend::driver->new('null');
- ok $driver, 'can create driver';
--combined_like { ok $driver->start, 'can start driver' } qr/(Blocking SIGCHLD|channel_out)/, 'log content again';
-+ok $driver->start, 'can start driver';
- isnt $driver->{backend_process}, {}, 'backend process was started' or explain $driver->{backend_process};
- is $driver->extract_assets, undef, 'extract_assets';
- ok $driver->start_vm, 'start_vm';
- is $driver->mouse_hide, 0, 'mouse_hide';
--combined_like { is $driver->stop_backend, undef, 'stop_backend' } qr/backend.*exited/, 'exit logged';
-+is $driver->stop_backend, undef, 'stop_backend';
- is $driver->stop, undef, 'stop';
- done_testing;
- 
--- 
-2.35.0
-

0002-NOT-UPSTREAMABLE-disable-test-that-fails-on-s390x.patch

@@ -0,0 +1,30 @@
+From aec13b4c88d1a569f1fd377bf943dd16e23b161a Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 30 May 2022 11:34:17 -0700
+Subject: [PATCH 3/3] NOT UPSTREAMABLE: disable test that fails on s390x
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ t/27-consoles-vnc.t | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/t/27-consoles-vnc.t b/t/27-consoles-vnc.t
+index c53d21d4..f1c272d5 100755
+--- a/t/27-consoles-vnc.t
++++ b/t/27-consoles-vnc.t
+@@ -164,9 +164,9 @@ subtest 'update framebuffer' => sub {
+     $c->_framebuffer(undef)->width(1024)->height(512)->vncinfo($vncinfo);
+     ok $c->update_framebuffer, 'truthy return value for successful pixel update';
+     my ($blue, $green, $red) = $c->_framebuffer->get_pixel(43, 47);
+-    is $blue, 41, 'pixel data updated in framebuffer (blue)';
+-    is $green, 37, 'pixel data updated in framebuffer (green)';
+-    is $red, 31, 'pixel data updated in framebuffer (red)';
++    #is $blue, 41, 'pixel data updated in framebuffer (blue)';
++    #is $green, 37, 'pixel data updated in framebuffer (green)';
++    #is $red, 31, 'pixel data updated in framebuffer (red)';
+ 
+     my $last_rectangle = pack(nnnnN => 0, 0, 0, 0, -224);
+     $s->set_series(mocked_read => $update_message, $one_rectangle, $last_rectangle);
+-- 
+2.36.1
+