[rpms/os-autoinst] rawhide: Update snapshot again, backport PR #2952 to fix serial console bug

[Adam Williamson <awilliam@redhat.com>]

A new commit has been pushed.

Repo   : rpms/os-autoinst
Branch : rawhide
Commit : d3c9fd6e8664183aed2d5c124cda79026d2ef8a9
Author : Adam Williamson <awilliam@redhat.com>
Date   : 2026-06-01T13:15:48-07:00
Stats  : +93/-4 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/os-autoinst/c/d3c9fd6e8664183aed2d5c124cda79026d2ef8a9?branch=rawhide

Log:
Update snapshot again, backport PR #2952 to fix serial console bug

---
diff --git a/.gitignore b/.gitignore
index 5b45533..93991f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,4 @@
 /os-autoinst-b85e4864b41e812c63df80ccd7adb4bf0cd4b2f9.tar.gz
 /os-autoinst-72cabd06219204bb1c60c664ac5edbd87f26e030.tar.gz
 /os-autoinst-11296ca97860b88bdc48348eba6b2db5673b22a6.tar.gz
+/os-autoinst-6ee8da2b6ee5c5f5c0a30581cc3a0b42ab5a8224.tar.gz

diff --git a/0001-script_run-type-command-and-marker-together-on-seria.patch b/0001-script_run-type-command-and-marker-together-on-seria.patch
new file mode 100644
index 0000000..1b0c937
--- /dev/null
+++ b/0001-script_run-type-command-and-marker-together-on-seria.patch
@@ -0,0 +1,83 @@
+From e6b17af9560e651c728de360f1c851d11b9a665b Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 1 Jun 2026 12:05:22 -0700
+Subject: [PATCH] script_run: "type" command and marker together on serial
+ console
+
+When doing script_run on a serial console, we "type" the command
+and then "type" the marker string in separate calls. Sometimes,
+somehow, extraneous characters seem to be added between the two
+in the output echoed back over the serial line, breaking the
+subsequent check. Typing them in one call should avoid this.
+
+Related ticket: https://progress.opensuse.org/issues/201516
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ distribution.pm |  3 +--
+ t/03-testapi.t  | 21 +++------------------
+ 2 files changed, 4 insertions(+), 20 deletions(-)
+
+diff --git a/distribution.pm b/distribution.pm
+index 127721be..f6d493b2 100644
+--- a/distribution.pm
++++ b/distribution.pm
+@@ -181,8 +181,7 @@ sub script_run ($self, $cmd, @args) {
+             my $marker = "; echo $str-\$?-" . ($args{output} ? "Comment: $args{output}" : '');
+             my $final_cmd = $skip_pretty ? "OA_NO_MARKER=1; $cmd" : $cmd;
+             if (testapi::is_serial_terminal) {
+-                testapi::type_string "$final_cmd", max_interval => $args{max_interval};
+-                testapi::type_string $marker, max_interval => $args{max_interval};
++                testapi::type_string "$final_cmd$marker", max_interval => $args{max_interval};
+                 testapi::wait_serial($final_cmd . $marker, no_regex => 1, quiet => $args{quiet}, buffer_size => (length $final_cmd) + 128, internal_marker => 1)
+                   or _handle_cmd_typing_error($final_cmd, \%args);
+                 testapi::type_string "\n", max_interval => $args{max_interval};
+diff --git a/t/03-testapi.t b/t/03-testapi.t
+index 2a4a92f8..00cb1642 100755
+--- a/t/03-testapi.t
++++ b/t/03-testapi.t
+@@ -382,12 +382,7 @@ subtest 'script_run' => sub {
+     is(assert_script_run('true', max_interval => 1), undef, 'nothing happens on success (slow typing)');
+     is_deeply($cmds, [
+             {
+-                text => 'true',
+-                cmd => 'backend_type_string',
+-                max_interval => 1
+-            },
+-            {
+-                text => '; echo XXX-$?-',
++                text => 'true; echo XXX-$?-',
+                 cmd => 'backend_type_string',
+                 max_interval => 1
+             },
+@@ -599,12 +594,7 @@ subtest 'upload_logs' => sub {
+     upload_logs '/var/log/messages';
+     is_deeply($cmds, [
+             {
+-                text => 'curl --form upload=@/var/log/messages --form upname=basetest-messages http://localhost:4243/LookAtMeImAToken/uploadlog/messages',
+-                cmd => 'backend_type_string',
+-                max_interval => 250
+-            },
+-            {
+-                text => '; echo XXX-$?-',
++                text => 'curl --form upload=@/var/log/messages --form upname=basetest-messages http://localhost:4243/LookAtMeImAToken/uploadlog/messages; echo XXX-$?-',
+                 cmd => 'backend_type_string',
+                 max_interval => 250
+             },
+@@ -618,12 +608,7 @@ subtest 'upload_logs' => sub {
+     upload_logs '/var/log/messages', failok => 1;
+     is_deeply($cmds, [
+             {
+-                text => 'curl --form upload=@/var/log/messages --form upname=basetest-messages --max-time 90 http://localhost:4243/LookAtMeImAToken/uploadlog/messages',
+-                cmd => 'backend_type_string',
+-                max_interval => 250
+-            },
+-            {
+-                text => '; echo XXX-$?-',
++                text => 'curl --form upload=@/var/log/messages --form upname=basetest-messages --max-time 90 http://localhost:4243/LookAtMeImAToken/uploadlog/messages; echo XXX-$?-',
+                 cmd => 'backend_type_string',
+                 max_interval => 250
+             },
+-- 
+2.54.0
+

diff --git a/os-autoinst.spec b/os-autoinst.spec
index e56b88a..f6248fc 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -24,9 +24,9 @@
 %global github_owner    os-autoinst
 %global github_name     os-autoinst
 %global github_version  5
-%global github_commit   11296ca97860b88bdc48348eba6b2db5673b22a6
+%global github_commit   6ee8da2b6ee5c5f5c0a30581cc3a0b42ab5a8224
 # if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date     20260521
+%global github_date     20260601
 %global shortcommit     %(c=%{github_commit}; echo ${c:0:7})
 
 Name:           os-autoinst
@@ -39,6 +39,11 @@ License:        GPL-2.0-or-later
 URL:            https://github.com/os-autoinst/os-autoinst
 ExcludeArch:    %{ix86}
 Source0:        https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
+# https://github.com/os-autoinst/os-autoinst/pull/2952
+# https://progress.opensuse.org/issues/201516
+# Type command and "marker string" together on the serial console in
+# script_run to avoid weird bug where we get extra chars between them
+Patch:          0001-script_run-type-command-and-marker-together-on-seria.patch
 
 # on SUSE this is conditional, for us it doesn't have to be but we
 # still use a macro just to keep build_requires similar for ease of
@@ -79,7 +84,7 @@ Source0:        https://github.com/%{github_owner}/%{github_name}/archive/%{gith
 # different releases)
 # SUSE just has 'ipxe-bootimgs', we have -aarch64 and -x86
 # The following line is generated from dependencies.yaml (upstream)
-%define test_base_requires %main_requires cpio icewm perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Syntax::Keyword::Try) perl(Test::Compile) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::MockRandom) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Perl::Critic) perl(Test::Pod) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 socat /usr/bin/Xvnc xterm xterm-console
+%define test_base_requires %main_requires cpio icewm perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Compile) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::MockRandom) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Perl::Critic) perl(Test::Pod) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 socat /usr/bin/Xvnc xterm xterm-console
 # The following line is generated from dependencies.yaml (upstream)
 %define test_version_only_requires perl(Mojo::IOLoop::ReadWriteProcess) >= 0.28
 # diff from SUSE: it's python3-pillow-tk, not python3-Pillow-tk, and

diff --git a/sources b/sources
index 266d1cd..1c7faff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-autoinst-11296ca97860b88bdc48348eba6b2db5673b22a6.tar.gz) = 2433621fde00881a8b12c9ed003f8ef9fd3a06a2a4f305910fc6873467575a9c39ca501c9fa345ccca144ffe88f9f9d4acea31e222da2ebdee16bcfb0fe9561b
+SHA512 (os-autoinst-6ee8da2b6ee5c5f5c0a30581cc3a0b42ab5a8224.tar.gz) = 27fa67f58b67d119c49a7c5d3016e2bfa23442ab1030c0fdbdad02002a470f69d3948bc7719a61d7a9208bdafa395d1d7e5fb1be0ed92a3b662fbabf870d8aa9