Adam Williamson
3 years ago
parent
ba3ac478af
commit
2d99eb41ce
@ -0,0 +1,56 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
From 7563875c62a44c9f9bc143b74bcb667c04ac3c33 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Williamson <awilliam@redhat.com>
|
|
||||||
Date: Wed, 19 Jan 2022 15:40:57 -0800
|
|
||||||
Subject: [PATCH] NOT UPSTREAMABLE: disable xterm-console dependent assertions
|
|
||||||
|
|
||||||
These assertions don't work without xterm-console.
|
|
||||||
|
|
||||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
||||||
---
|
|
||||||
t/29-backend-ipmi.t | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/t/29-backend-ipmi.t b/t/29-backend-ipmi.t
|
|
||||||
index abaf2463..f3ed64bd 100755
|
|
||||||
--- a/t/29-backend-ipmi.t
|
|
||||||
+++ b/t/29-backend-ipmi.t
|
|
||||||
@@ -45,9 +45,9 @@ ok $backend->do_stop_vm, 'can call do_stop_vm';
|
|
||||||
ok !$backend->check_socket(undef), 'check_socket not returning true by default';
|
|
||||||
ok $backend->get_mc_status, 'can call get_mc_status';
|
|
||||||
|
|
||||||
-is $testapi::distri->{consoles}->{sol}->{args}->{log}, '1';
|
|
||||||
-$testapi::distri->{consoles}->{sol}->{DISPLAY} = "display";
|
|
||||||
-ok !$testapi::distri->{consoles}->{sol}->callxterm('ipmi', "console"), "can create console with log enabled";
|
|
||||||
+#is $testapi::distri->{consoles}->{sol}->{args}->{log}, '1';
|
|
||||||
+#$testapi::distri->{consoles}->{sol}->{DISPLAY} = "display";
|
|
||||||
+#ok !$testapi::distri->{consoles}->{sol}->callxterm('ipmi', "console"), "can create console with log enabled";
|
|
||||||
|
|
||||||
# reduce retries for testing
|
|
||||||
$bmwqemu::vars{IPMI_MC_RESET_MAX_TRIES} = $bmwqemu::vars{IPMI_MC_RESET_TIMEOUT} = 3;
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
@ -1 +1 @@
|
|||||||
SHA512 (os-autoinst-fdd1a2d8bdc9fdf9b23ae8f01b42b5092e6343dd.tar.gz) = c4a865f4aeb713705db15c43f2dc63c8c82dbf3dbe2a6de939452d528be20bc0683df0a589107d0f36c2d9a1bc6cb8553b5af352f179cb85d5761883e65c3f2b
|
SHA512 (os-autoinst-ab6013d738344791507525e45cbd9f972a444968.tar.gz) = 9f4f3621b8dfcada319edc26465cc575cc0f7aa992653951e2cc9cb2bda3c17c3354e3ee44aa53180e9595bce2e81a925a936c318a319a359b7a2faccfe64093
|
||||||
|
|||||||
Loading…
Reference in new issue