From 2a65d73dc1f90d8606c318cefaf6e3a8eddfd50e Mon Sep 17 00:00:00 2001 From: Adam Williamson 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 --- 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