fmuellner pushed to rpms/mutter (f38). "Update to 44.6"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-01 00:22:20 UTC
From 4dba304688b34e449efc047a185a461791bffb46 Mon Sep 17 00:00:00 2001
From: Florian Müllner <fmuellner(a)gnome.org>
Date: Nov 01 2023 00:22:09 +0000
Subject: Update to 44.6
---
diff --git a/.gitignore b/.gitignore
index 5f25aa6..0f3c143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -211,3 +211,4 @@ mutter-2.31.5.tar.bz2
/mutter-44.3.tar.xz
/mutter-44.4.tar.xz
/mutter-44.5.tar.xz
+/mutter-44.6.tar.xz
diff --git a/mutter.spec b/mutter.spec
index b41aa3d..76e3003 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -12,7 +12,7 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: mutter
-Version: 44.5
+Version: 44.6
Release: %autorelease
Summary: Window and compositing manager based on Clutter
diff --git a/sources b/sources
index 70a435d..ffee176 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mutter-44.5.tar.xz) = 1e5b88bd0b671cd8778df2daa6847f3f8e2470d30e611d10ab1a27d66cc5176168d497f63de8baec88525b74e4fc8d4754dc0021547a536bfaa1ba5222b88421
+SHA512 (mutter-44.6.tar.xz) = 6db992306a8264ffc0774ed446bd5c72da523c40def8cc78973546e0cae9f2f3a6767acfaaea2bde7eaed9c19f9f853004ad9bc36a84d59cd24a9e4389bd83c5
https://src.fedoraproject.org/rpms/mutter/c/4dba304688b34e449efc047a185a4...
6Â months, 1Â week
adamwill pushed to rpms/openqa (f39). "Add missing patch (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-01 00:17:33 UTC
From ae3b55a30cf9fa78de2bd91e0cacb494715fa48d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam(a)redhat.com>
Date: Nov 01 2023 00:01:39 +0000
Subject: Add missing patch
Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
---
diff --git a/0001-Fix-skipping-Selenium-tests.patch b/0001-Fix-skipping-Selenium-tests.patch
new file mode 100644
index 0000000..fcc1f0f
--- /dev/null
+++ b/0001-Fix-skipping-Selenium-tests.patch
@@ -0,0 +1,66 @@
+From 028fa21c9187908f0facaa70728a809b91ad6c49 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam(a)redhat.com>
+Date: Tue, 24 Oct 2023 16:11:10 -0700
+Subject: [PATCH] Fix skipping Selenium tests
+
+Not sure what changed, but on current Fedora Rawhide, just
+'exit'ing like this now results in a 255 exit code and a failed
+test. Before:
+
+ Install Selenium::Remote::Driver and Selenium::Chrome to run these tests
+./t/ui/27-plugin_obs_rsync_status_details.t ................. ok
+ Install Selenium::Remote::Driver and Selenium::Chrome to run these tests
+./t/ui/28-keys_to_render_as_links.t ......................... ok
+All tests successful.
+
+after:
+
+ Install Selenium::Remote::Driver and Selenium::Chrome to run these tests
+./t/ui/27-plugin_obs_rsync_status_details.t ................. ok
+ Install Selenium::Remote::Driver and Selenium::Chrome to run these tests
+./t/ui/28-keys_to_render_as_links.t ......................... skipped: (no reason given)
+...
+./t/ui/28-keys_to_render_as_links.t (Wstat: 65280 (exited 255) Tests: 0 Failed: 0)
+ Non-zero exit status: 255
+
+This uses `plan skip_all` to skip these tests correctly.
+
+Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
+---
+ t/lib/OpenQA/SeleniumTest.pm | 4 +---
+ t/ui/27-plugin_obs_rsync_status_details.t | 3 ++-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/t/lib/OpenQA/SeleniumTest.pm b/t/lib/OpenQA/SeleniumTest.pm
+index cad768a52..86d08f53e 100644
+--- a/t/lib/OpenQA/SeleniumTest.pm
++++ b/t/lib/OpenQA/SeleniumTest.pm
+@@ -352,9 +352,7 @@ sub get_mojoport () { $mojoport }
+ # uncoverable subroutine
+ # uncoverable statement
+ sub driver_missing () {
+- diag 'Install Selenium::Remote::Driver and Selenium::Chrome to run these tests'; # uncoverable statement
+- done_testing; # uncoverable statement
+- exit; # uncoverable statement
++ plan skip_all => 'Install Selenium::Remote::Driver and Selenium::Chrome to run these tests'; # uncoverable statement
+ }
+
+ END {
+diff --git a/t/ui/27-plugin_obs_rsync_status_details.t b/t/ui/27-plugin_obs_rsync_status_details.t
+index 89efcb4e2..379bed6a7 100644
+--- a/t/ui/27-plugin_obs_rsync_status_details.t
++++ b/t/ui/27-plugin_obs_rsync_status_details.t
+@@ -11,8 +11,9 @@ use OpenQA::Test::TimeLimit '60';
+ use OpenQA::SeleniumTest;
+ use OpenQA::Test::ObsRsync 'setup_obs_rsync_test';
+
++driver_missing unless check_driver_modules;
+ my ($t, $tempdir) = setup_obs_rsync_test(fixtures_glob => '01-jobs.pl 03-users.pl');
+-driver_missing unless my $driver = call_driver();
++my $driver = call_driver();
+ $driver->find_element_by_class('navbar-brand')->click;
+ $driver->find_element_by_link_text('Login')->click;
+
+--
+2.41.0
+
https://src.fedoraproject.org/rpms/openqa/c/ae3b55a30cf9fa78de2bd91e0cacb...
6Â months, 1Â week
adamwill pushed to rpms/openqa (f39). "Update to a recent upstream
git snapshot, resync spec"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-01 00:17:33 UTC
From 128095b29f02dd448a8f035ed577974f21ea1eaf Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam(a)redhat.com>
Date: Oct 31 2023 23:42:55 +0000
Subject: Update to a recent upstream git snapshot, resync spec
---
diff --git a/.gitignore b/.gitignore
index 7e81efb..9c546a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,3 +120,5 @@
/assetcache-f229f6d5c08963eb94886054c43d48a1d92c4d9a.tar.xz
/openQA-0864455630bf2987681b56e57803a99bae73d742.tar.gz
/assetcache-0864455630bf2987681b56e57803a99bae73d742.tar.xz
+/openQA-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.gz
+/assetcache-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.xz
diff --git a/23-fedora-messaging.t b/23-fedora-messaging.t
index 102fb03..13c7c6b 100644
--- a/23-fedora-messaging.t
+++ b/23-fedora-messaging.t
@@ -76,7 +76,7 @@ EOF
my $tempdir = tempdir;
$ENV{OPENQA_CONFIG} = $tempdir;
-path($ENV{OPENQA_CONFIG})->make_path->child("openqa.ini")->spurt($conf);
+path($ENV{OPENQA_CONFIG})->make_path->child("openqa.ini")->spew($conf);
my $t = Test::Mojo->new('OpenQA::WebAPI');
diff --git a/openqa.spec b/openqa.spec
index 707667a..8d09a85 100644
--- a/openqa.spec
+++ b/openqa.spec
@@ -23,9 +23,9 @@
%global github_owner os-autoinst
%global github_name openQA
%global github_version 4.6
-%global github_commit 0864455630bf2987681b56e57803a99bae73d742
+%global github_commit c944acc8be48645a4e5d8e98882e4e54fcf85287
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20230525
+%global github_date 20231024
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
# can't use linebreaks here!
@@ -46,12 +46,14 @@
# Diff from SUSE: we use 'perl-interpreter' where they use 'perl',
# our 'perl' is a metapackage and we don't want all of it
# we use 'chrony' where they use 'ntp-daemon'
+# their versioning of mojolicious is different due to
+# https://github.com/openSUSE/cpanspec/issues/47
# The following line is generated from dependencies.yaml (upstream)
-%define common_requires chrony perl-interpreter >= 5.20.0 perl(Carp::Always) >= 0.14.02 perl(Config::IniFiles) perl(Config::Tiny) perl(Cpanel::JSON::XS) >= 4.09 perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Filesys::Df) perl(Getopt::Long) perl(Minion) >= 10.25 perl(Mojolicious) >= 9.30 perl(Regexp::Common) perl(Storable) perl(Time::Moment) perl(Try::Tiny)
+%define common_requires chrony perl-interpreter >= 5.20.0 perl(Carp::Always) >= 0.14.02 perl(Config::IniFiles) perl(Config::Tiny) perl(Cpanel::JSON::XS) >= 4.09 perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Filesys::Df) perl(Getopt::Long) perl(Minion) >= 10.25 perl(Mojolicious) >= 9.34 perl(Regexp::Common) perl(Storable) perl(Time::Moment) perl(Try::Tiny)
# Diff from SUSE: we package bsdcat and bsdtar separately
# runtime requirements for the main package that are not required by other sub-packages
# The following line is generated from dependencies.yaml (upstream)
-%define main_requires %assetpack_requires bsdcat bsdtar git-core hostname perl(BSD::Resource) perl(Carp) perl(CommonMark) perl(Config::Tiny) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DeploymentHandler) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::OptimisticLocking) perl(DBIx::Class::ResultClass::HashRefInflator) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(Date::Format) perl(DateTime) perl(DateTime::Duration) perl(DateTime::Format::Pg) perl(Exporter) perl(Fcntl) perl(File::Basename) perl(File::Copy) perl(File::Copy::Recursive) perl(File::Path) perl(File::Spec) perl(FindBin) perl(Getopt::Long::Descriptive) perl(IO::Handle) perl(IPC::Run) perl(JSON::Validator) perl(LWP::UserAgent) perl(Module::Load::Conditional) perl(Module::Pluggable) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::RabbitMQ::Client) >= 0.2 perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Pod::POM) perl(SQL::Translator) perl(Scalar::Util) perl(Sort::Versions) perl(Text::Diff) perl(Time::HiRes) perl(Time::ParseDate) perl(Time::Piece) perl(Time::Seconds) perl(URI::Escape) perl(YAML::PP) >= 0.026 perl(YAML::XS) perl(aliased) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings)
+%define main_requires %assetpack_requires bsdcat bsdtar git-core hostname perl(BSD::Resource) perl(Carp) perl(CommonMark) perl(Config::Tiny) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DeploymentHandler) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::OptimisticLocking) perl(DBIx::Class::ResultClass::HashRefInflator) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(Date::Format) perl(DateTime) perl(DateTime::Duration) perl(DateTime::Format::Pg) perl(Exporter) perl(Fcntl) perl(File::Basename) perl(File::Copy) perl(File::Copy::Recursive) perl(File::Path) perl(File::Spec) perl(FindBin) perl(Getopt::Long::Descriptive) perl(IO::Handle) perl(IPC::Run) perl(JSON::Validator) perl(LWP::UserAgent) perl(Module::Load::Conditional) perl(Module::Pluggable) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::RabbitMQ::Client) >= 0.2 perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::OAuth2) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Pod::POM) perl(SQL::Translator) perl(Scalar::Util) perl(Sort::Versions) perl(Text::Diff) perl(Time::HiRes) perl(Time::ParseDate) perl(Time::Piece) perl(Time::Seconds) perl(URI::Escape) perl(YAML::PP) >= 0.026 perl(YAML::XS) perl(aliased) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings)
# The following line is generated from dependencies.yaml (upstream)
%define client_requires curl git-core jq perl(Getopt::Long::Descriptive) perl(IO::Socket::SSL) >= 2.009 perl(IPC::Run) perl(JSON::Validator) perl(LWP::Protocol::https) perl(LWP::UserAgent) perl(Test::More) perl(YAML::PP) >= 0.020 perl(YAML::XS)
# Diff from SUSE 1: case (they have openQA-client, we have openqa-client)
@@ -71,7 +73,7 @@
# compile-check-all test fails on the in-tree critic module if we leave
# that out)
# The following line is generated from dependencies.yaml (upstream)
-%define test_requires %common_requires %main_requires %python_scripts_requires %worker_requires ShellCheck curl jq os-autoinst-devel perl(App::cpanminus) perl(Mojolicious::Plugin::OAuth2) perl(Perl::Critic) perl(Test::Exception) perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 postgresql-server
+%define test_requires %common_requires %main_requires %python_scripts_requires %worker_requires ShellCheck curl jq os-autoinst-devel perl(App::cpanminus) perl(Perl::Critic) perl(Test::Exception) perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 postgresql-server
%ifarch x86_64
%define qemu qemu qemu-kvm
%else
@@ -96,7 +98,7 @@
Name: openqa
Version: %{github_version}%{?github_date:^%{github_date}git%{shortcommit}}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: OS-level automated testing framework
License: GPLv2+
Url: http://os-autoinst.github.io/openQA/
@@ -124,9 +126,9 @@ Source4: 23-fedora-messaging.t
Source5: geekotest.conf
Source6: openQA-worker.conf
-# https://github.com/os-autoinst/openQA/pull/5337
-# add https://gitlab.com/fedora/sigs to bugrefs
-Patch: 0001-Add-Fedora-SIGs-gitlab-group-to-bugrefs.patch
+# https://github.com/os-autoinst/openQA/pull/5349
+# fix skipping tests when selenium driver is missing
+Patch: 0001-Fix-skipping-Selenium-tests.patch
BuildRequires: make
BuildRequires: %{python_scripts_requires}
@@ -310,7 +312,9 @@ You only need this package if you have a local postgresql server
next to the webui.
%package single-instance
-Summary: Convenience package for a single-instance setup
+Summary: Convenience package for a single-instance setup using apache proxy
+Provides: %{name}-single-instance-apache
+Provides: %{name}-single-instance-apache2
Requires: %{name}-local-db
Requires: %{name} = %{version}
Requires: %{name}-worker = %{version}
@@ -319,6 +323,17 @@ Requires: httpd
%description single-instance
Use this package to setup a local instance with all services provided together.
+%package single-instance-nginx
+Summary: Convenience package for a single-instance setup using nginx proxy
+Group: Development/Tools/Other
+Requires: %{name}-local-db
+Requires: %{name} = %{version}
+Requires: %{name}-worker = %{version}
+Requires: nginx
+
+%description single-instance-nginx
+Use this package to setup a local instance with all services provided together.
+
%package bootstrap
Summary: Automated openQA setup
@@ -333,6 +348,18 @@ Summary: The openQA documentation
Documentation material covering installation, configuration, basic test
writing, etc., covering both openQA and the os-autoinst test engine.
+%package munin
+Summary: Munin scripts
+Group: Development/Tools/Other
+Requires: munin
+Requires: munin-node
+Requires: curl
+Requires: perl-interpreter
+
+%description munin
+Use this package to install munin scripts that allow to monitor some openQA
+statistics.
+
%prep
%autosetup -p1 -n %{github_name}-%{github_commit} -a 1
sed -e 's,/bin/env python,/bin/python,' -i script/openqa-label-all
@@ -341,6 +368,8 @@ sed -i -e 's,apache2\.service,httpd\.service,g' systemd/*.service
# ...Fedora keeps httpd config here, SUSE keeps it there.
sed -i -e 's,"$(DESTDIR)"/etc/apache2/vhosts.d,"$(DESTDIR)"%{_sysconfdir}/httpd/conf.d,g' Makefile
sed -i -e 's,/etc/apache2/vhosts.d,%{_sysconfdir}/httpd/conf.d,g' etc/apache2/vhosts.d/*
+# ...Fedora keeps nginx config here, SUSE keeps it there.
+sed -i -e 's,"$(DESTDIR)"/etc/nginx/vhosts.d,"$(DESTDIR)"%{_sysconfdir}/nginx/conf.d,g' Makefile
# These are the Fedora-y standard TLS cert/key locations.
sed -i -e 's,/etc/apache2/ssl.crt,%{_sysconfdir}/pki/tls/certs,g' etc/apache2/vhosts.d/*
sed -i -e 's,/etc/apache2/ssl.key,%{_sysconfdir}/pki/tls/private,g' etc/apache2/vhosts.d/*
@@ -377,6 +406,12 @@ ln -s %{_datadir}/openqa/script/openqa-validate-yaml %{buildroot}%{_bindir}/open
ln -s %{_datadir}/openqa/script/setup-db %{buildroot}%{_bindir}/openqa-setup-db
ln -s %{_datadir}/openqa/script/openqa-label-all %{buildroot}%{_bindir}/openqa-label-all
+# munin
+install -d -m 755 %{buildroot}/%{_datadir}/munin/plugins
+install -m 755 contrib/munin/plugins/minion %{buildroot}/%{_datadir}/munin/plugins/openqa_minion_
+install -d -m 755 %{buildroot}/%{_sysconfdir}/munin/plugin-conf.d
+install -m 644 contrib/munin/config/minion.config %{buildroot}/%{_sysconfdir}/munin/plugin-conf.d/openqa-minion
+
# on the whole I think it's "less bad" to install our duplicate copies
# of these over top of the ones from the tarball. if they ever go out
# of sync, at least our scriptlets will match the installed config
@@ -432,6 +467,8 @@ export OPENQA_TEST_TIMEOUT_SCALE_CI=15
# packaging
export CONTAINER_TEST=0
export HELM_TEST=0
+# We don't want fatal warnings during package building
+export PERL_TEST_WARNINGS_ONLY_REPORT_WARNINGS=1
# GIT_CEILING_DIRECTORIES here avoids a case where git error handling
# can differ when you run the build in mock and cause 16-utils-runcmd
# to fail
@@ -455,7 +492,9 @@ rm -rf %{buildroot}/DB
%post httpd
if [ $1 -eq 1 ]; then
- echo "### copy and edit /etc/httpd/conf.d/openqa.conf.template!"
+ echo "### copy and edit /etc/httpd/conf.d/openqa.conf.template if using apache!"
+ echo "### copy and edit /etc/nginx/conf.d/openqa.conf.template if using nginx!"
+
fi
%preun
@@ -599,6 +638,7 @@ fi
%dir %{_unitdir}
%{_prefix}/lib/systemd/system-generators/systemd-openqa-generator
%{_unitdir}/openqa-worker.target
+%{_unitdir}/openqa-worker.slice
%{_unitdir}/openqa-worker@.service
%{_unitdir}/openqa-worker-plain@.service
%{_unitdir}/openqa-worker-cacheservice-minion.service
@@ -636,6 +676,12 @@ fi
%config %{_sysconfdir}/httpd/conf.d/openqa.conf.template
%config %{_sysconfdir}/httpd/conf.d/openqa-common.inc
%config %{_sysconfdir}/httpd/conf.d/openqa-ssl.conf.template
+# nginx vhost
+%dir %{_sysconfdir}/nginx
+%dir %{_sysconfdir}/nginx/conf.d
+%config %{_sysconfdir}/nginx/conf.d/openqa.conf.template
+%config(noreplace) %{_sysconfdir}/nginx/conf.d/openqa-locations.inc
+%config(noreplace) %{_sysconfdir}/nginx/conf.d/openqa-upstreams.inc
%files client
%dir %{_datadir}/openqa
@@ -679,10 +725,20 @@ fi
%files single-instance
+%files single-instance-nginx
+
%files bootstrap
%{_datadir}/openqa/script/openqa-bootstrap
%{_datadir}/openqa/script/openqa-bootstrap-container
+%files munin
+%defattr(-,root,root)
+%doc contrib/munin/config/minion.config
+%dir %{_sysconfdir}/munin
+%dir %{_sysconfdir}/munin/plugin-conf.d
+%{_datadir}/munin/plugins/openqa_minion_
+%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/openqa-minion
+
%files plugin-fedora-messaging
%{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraMessaging.pm
@@ -690,6 +746,10 @@ fi
%{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm
%changelog
+* Tue Oct 31 2023 Adam Williamson <awilliam(a)redhat.com> - 4.6^20231024gitc944acc-1
+- Update to a recent upstream git snapshot, resync spec
+- Backport PR #5349 to fix a test skipping problem
+
* Thu Oct 19 2023 Adam Williamson <awilliam(a)redhat.com> - 4.6^20230525git0864455-3
- Backport PR #5337 to add the gitlab fedora flatpak repo for bugrefs
diff --git a/sources b/sources
index d757906..b3a09ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openQA-0864455630bf2987681b56e57803a99bae73d742.tar.gz) = ed9fa80d8823c3a60ac54e6d3a5e669255f6f4623cb07ec640206605f9c0d2ccc0139b3c8aee10dce3e7251dbb28784f313778a4d4c5716c93274e4649fa2caa
-SHA512 (assetcache-0864455630bf2987681b56e57803a99bae73d742.tar.xz) = dfdfbe8addd8485f667364496e8c74bc789d3e077153840dc79fc10654083f5e55907f21cf666e727f4d5ed9b27c327a495c7e927b4605eea448416116758aa1
+SHA512 (openQA-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.gz) = c07a6aeaed761e4588aa55b06abc2b3827e3aeb0cbf77118ab32daaed42ada35b5a610c094e16a5de4638366ff13902c16b310b79fa87549f0a37c7f4e3e4f93
+SHA512 (assetcache-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.xz) = 2d4b9391be3951953cdbce25ad1d34e6f184757af31a08e7b96ec90b93d7dfc6e3a985c6c20e8cf68c14b3fb9969017a659eeed79ec64ac2062fb6afee195173
https://src.fedoraproject.org/rpms/openqa/c/128095b29f02dd448a8f035ed5779...
6Â months, 1Â week
adamwill pushed to rpms/os-autoinst (f39). "Update to latest git,
resync spec"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-01 00:17:10 UTC
From 37d1bdbcf3e9211d547374e7dd1000037b5f2110 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam(a)redhat.com>
Date: Nov 01 2023 00:11:24 +0000
Subject: Update to latest git, resync spec
---
diff --git a/.gitignore b/.gitignore
index bc60a10..ec48441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@
/os-autoinst-5a76fb8e636ccc4fdf22b7738caae6aa40895920.tar.gz
/os-autoinst-6802f4479120a2954adbfba6dbe2779842c5ac91.tar.gz
/os-autoinst-1946eb18d76980581d842e1e2569dee33e5a5b45.tar.gz
+/os-autoinst-64b339c8f5623ce314126972d9fd171ab3190bcd.tar.gz
diff --git a/os-autoinst.spec b/os-autoinst.spec
index be64b43..56277d6 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -30,14 +30,14 @@
%global github_owner os-autoinst
%global github_name os-autoinst
%global github_version 4.6
-%global github_commit 1946eb18d76980581d842e1e2569dee33e5a5b45
+%global github_commit 64b339c8f5623ce314126972d9fd171ab3190bcd
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20230527
+%global github_date 20231025
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
Name: os-autoinst
Version: %{github_version}%{?github_date:^%{github_date}git%{shortcommit}}
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: OS-level test automation
License: GPLv2+
URL: https://os-autoinst.github.io/openQA/
@@ -61,8 +61,10 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith
# diff from SUSE: added main_requires_additional, dropped perl-base
# which does not exist in Fedora - we have perl(base) in
# main_requires_additional and the perl(:MODULE_COMPAT) require below
+# their versioning of mojolicious is different due to
+# https://github.com/openSUSE/cpanspec/issues/47
# The following line is generated from dependencies.yaml (upstream)
-%define main_requires %main_requires_additional git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(File::chdir) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(JSON::Validator) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Time::Moment) perl(Time::Seconds) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(YAML::PP) perl(YAML::XS) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings)
+%define main_requires %main_requires_additional git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(File::chdir) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(JSON::Validator) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 9.34 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Time::Moment) perl(Time::Seconds) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(YAML::PP) perl(YAML::XS) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings) rsync sshpass
# diff from SUSE: SUSE has python3-yamllint, Fedora has just yamllint
# The following line is generated from dependencies.yaml (upstream)
%define yamllint_requires yamllint
@@ -71,9 +73,9 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith
# diff from SUSE: replaced qemu with qemu-kvm, qemu-tools with
# qemu-img, qemu-x86 with qemu-system-i386, xorg-x11-Xvnc with
# tigervnc-server-minimal (provider of /usr/bin/Xvnc)
-# Fedora
+# 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(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::MockRandom) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 tigervnc-server-minimal xterm xterm-console
+%define test_base_requires %main_requires cpio icewm ipxe-bootimgs-x86 ipxe-bootimgs-aarch64 perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::MockRandom) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 tigervnc-server-minimal 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
@@ -100,9 +102,13 @@ Recommends: /usr/bin/qemu-img
Recommends: e2fsprogs
# Optional dependency for Python test API support
Recommends: perl(Inline::Python)
+# More efficient video encoding is done automatically if ffmpeg is present
+Recommends: ffmpeg >= 4
BuildRequires: %test_requires %test_version_only_requires
# For unbuffered output of Perl testsuite
BuildRequires: expect
+# tests use chattr
+BuildRequires: e2fsprogs
Requires: %main_requires
Requires(pre): %{_bindir}/getent
Requires(pre): %{_sbindir}/useradd
@@ -164,6 +170,8 @@ rm xt/30-make.t
# we don't really need to ship this in the package, usually the web UI
# is much better for needle editing
rm %{buildroot}%{_prefix}/lib/os-autoinst/crop.py*
+# this is only useful on SUSE
+rm %{buildroot}%{_bindir}/os-autoinst-setup-multi-machine
# we're going to %%license this
rm %{buildroot}%{_pkgdocdir}/COPYING
ls -lR %buildroot
@@ -178,6 +186,8 @@ export CI=1
# account for sporadic slowness in build environments
# https://progress.opensuse.org/issues/89059
export OPENQA_TEST_TIMEOUT_SCALE_CI=20
+# We don't want fatal warnings during package building
+export PERL_TEST_WARNINGS_ONLY_REPORT_WARNINGS=1
# Enable verbose test output as we can not store test artifacts within package
# build environments in case of needing to investigate failures
export PROVE_ARGS="--timer -v --nocolor"
@@ -243,6 +253,9 @@ rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm
%files devel
%changelog
+* Wed Oct 25 2023 Adam Williamson <awilliam(a)redhat.com> - 4.6^20231025git64b339c-1
+- Update to latest git, resync spec
+
* Mon Aug 07 2023 Sérgio Basto <sergio(a)serjux.com> - 4.6^20230527git1946eb1-4
- Rebuild for opencv 4.8.0
diff --git a/sources b/sources
index 7b9fe54..4fbf73f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-autoinst-1946eb18d76980581d842e1e2569dee33e5a5b45.tar.gz) = add28e23c1c32e50e191f6afcc99f7e75d550a3b398b97586989f9a828298fe8088e7d2a749a2d4c5a984f165ca95548e3420eefd08ccd34c51c1b4b7cbf87b1
+SHA512 (os-autoinst-64b339c8f5623ce314126972d9fd171ab3190bcd.tar.gz) = 5ef0925f655e173c1bd0796e2ebe020576dc6330518a61d60649ad2ef3ebe065e33ebcf8c3a04d9b0cfd70bc4be4de334987b87c5e4c92b749b3c11c534378e6
https://src.fedoraproject.org/rpms/os-autoinst/c/37d1bdbcf3e9211d547374e7...
6Â months, 1Â week
adamwill pushed to rpms/os-autoinst (rawhide). "Update to latest
git, resync spec"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-01 00:11:43 UTC
From 37d1bdbcf3e9211d547374e7dd1000037b5f2110 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam(a)redhat.com>
Date: Nov 01 2023 00:11:24 +0000
Subject: Update to latest git, resync spec
---
diff --git a/.gitignore b/.gitignore
index bc60a10..ec48441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@
/os-autoinst-5a76fb8e636ccc4fdf22b7738caae6aa40895920.tar.gz
/os-autoinst-6802f4479120a2954adbfba6dbe2779842c5ac91.tar.gz
/os-autoinst-1946eb18d76980581d842e1e2569dee33e5a5b45.tar.gz
+/os-autoinst-64b339c8f5623ce314126972d9fd171ab3190bcd.tar.gz
diff --git a/os-autoinst.spec b/os-autoinst.spec
index be64b43..56277d6 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -30,14 +30,14 @@
%global github_owner os-autoinst
%global github_name os-autoinst
%global github_version 4.6
-%global github_commit 1946eb18d76980581d842e1e2569dee33e5a5b45
+%global github_commit 64b339c8f5623ce314126972d9fd171ab3190bcd
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20230527
+%global github_date 20231025
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
Name: os-autoinst
Version: %{github_version}%{?github_date:^%{github_date}git%{shortcommit}}
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: OS-level test automation
License: GPLv2+
URL: https://os-autoinst.github.io/openQA/
@@ -61,8 +61,10 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith
# diff from SUSE: added main_requires_additional, dropped perl-base
# which does not exist in Fedora - we have perl(base) in
# main_requires_additional and the perl(:MODULE_COMPAT) require below
+# their versioning of mojolicious is different due to
+# https://github.com/openSUSE/cpanspec/issues/47
# The following line is generated from dependencies.yaml (upstream)
-%define main_requires %main_requires_additional git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(File::chdir) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(JSON::Validator) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Time::Moment) perl(Time::Seconds) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(YAML::PP) perl(YAML::XS) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings)
+%define main_requires %main_requires_additional git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(File::chdir) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(JSON::Validator) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 9.34 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Time::Moment) perl(Time::Seconds) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(YAML::PP) perl(YAML::XS) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings) rsync sshpass
# diff from SUSE: SUSE has python3-yamllint, Fedora has just yamllint
# The following line is generated from dependencies.yaml (upstream)
%define yamllint_requires yamllint
@@ -71,9 +73,9 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith
# diff from SUSE: replaced qemu with qemu-kvm, qemu-tools with
# qemu-img, qemu-x86 with qemu-system-i386, xorg-x11-Xvnc with
# tigervnc-server-minimal (provider of /usr/bin/Xvnc)
-# Fedora
+# 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(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::MockRandom) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 tigervnc-server-minimal xterm xterm-console
+%define test_base_requires %main_requires cpio icewm ipxe-bootimgs-x86 ipxe-bootimgs-aarch64 perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::MockRandom) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 tigervnc-server-minimal 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
@@ -100,9 +102,13 @@ Recommends: /usr/bin/qemu-img
Recommends: e2fsprogs
# Optional dependency for Python test API support
Recommends: perl(Inline::Python)
+# More efficient video encoding is done automatically if ffmpeg is present
+Recommends: ffmpeg >= 4
BuildRequires: %test_requires %test_version_only_requires
# For unbuffered output of Perl testsuite
BuildRequires: expect
+# tests use chattr
+BuildRequires: e2fsprogs
Requires: %main_requires
Requires(pre): %{_bindir}/getent
Requires(pre): %{_sbindir}/useradd
@@ -164,6 +170,8 @@ rm xt/30-make.t
# we don't really need to ship this in the package, usually the web UI
# is much better for needle editing
rm %{buildroot}%{_prefix}/lib/os-autoinst/crop.py*
+# this is only useful on SUSE
+rm %{buildroot}%{_bindir}/os-autoinst-setup-multi-machine
# we're going to %%license this
rm %{buildroot}%{_pkgdocdir}/COPYING
ls -lR %buildroot
@@ -178,6 +186,8 @@ export CI=1
# account for sporadic slowness in build environments
# https://progress.opensuse.org/issues/89059
export OPENQA_TEST_TIMEOUT_SCALE_CI=20
+# We don't want fatal warnings during package building
+export PERL_TEST_WARNINGS_ONLY_REPORT_WARNINGS=1
# Enable verbose test output as we can not store test artifacts within package
# build environments in case of needing to investigate failures
export PROVE_ARGS="--timer -v --nocolor"
@@ -243,6 +253,9 @@ rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm
%files devel
%changelog
+* Wed Oct 25 2023 Adam Williamson <awilliam(a)redhat.com> - 4.6^20231025git64b339c-1
+- Update to latest git, resync spec
+
* Mon Aug 07 2023 Sérgio Basto <sergio(a)serjux.com> - 4.6^20230527git1946eb1-4
- Rebuild for opencv 4.8.0
diff --git a/sources b/sources
index 7b9fe54..4fbf73f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-autoinst-1946eb18d76980581d842e1e2569dee33e5a5b45.tar.gz) = add28e23c1c32e50e191f6afcc99f7e75d550a3b398b97586989f9a828298fe8088e7d2a749a2d4c5a984f165ca95548e3420eefd08ccd34c51c1b4b7cbf87b1
+SHA512 (os-autoinst-64b339c8f5623ce314126972d9fd171ab3190bcd.tar.gz) = 5ef0925f655e173c1bd0796e2ebe020576dc6330518a61d60649ad2ef3ebe065e33ebcf8c3a04d9b0cfd70bc4be4de334987b87c5e4c92b749b3c11c534378e6
https://src.fedoraproject.org/rpms/os-autoinst/c/37d1bdbcf3e9211d547374e7...
6Â months, 1Â week
adamwill pushed to rpms/openqa (rawhide). "Add missing patch (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-11-01 00:01:50 UTC
From ae3b55a30cf9fa78de2bd91e0cacb494715fa48d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam(a)redhat.com>
Date: Nov 01 2023 00:01:39 +0000
Subject: Add missing patch
Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
---
diff --git a/0001-Fix-skipping-Selenium-tests.patch b/0001-Fix-skipping-Selenium-tests.patch
new file mode 100644
index 0000000..fcc1f0f
--- /dev/null
+++ b/0001-Fix-skipping-Selenium-tests.patch
@@ -0,0 +1,66 @@
+From 028fa21c9187908f0facaa70728a809b91ad6c49 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam(a)redhat.com>
+Date: Tue, 24 Oct 2023 16:11:10 -0700
+Subject: [PATCH] Fix skipping Selenium tests
+
+Not sure what changed, but on current Fedora Rawhide, just
+'exit'ing like this now results in a 255 exit code and a failed
+test. Before:
+
+ Install Selenium::Remote::Driver and Selenium::Chrome to run these tests
+./t/ui/27-plugin_obs_rsync_status_details.t ................. ok
+ Install Selenium::Remote::Driver and Selenium::Chrome to run these tests
+./t/ui/28-keys_to_render_as_links.t ......................... ok
+All tests successful.
+
+after:
+
+ Install Selenium::Remote::Driver and Selenium::Chrome to run these tests
+./t/ui/27-plugin_obs_rsync_status_details.t ................. ok
+ Install Selenium::Remote::Driver and Selenium::Chrome to run these tests
+./t/ui/28-keys_to_render_as_links.t ......................... skipped: (no reason given)
+...
+./t/ui/28-keys_to_render_as_links.t (Wstat: 65280 (exited 255) Tests: 0 Failed: 0)
+ Non-zero exit status: 255
+
+This uses `plan skip_all` to skip these tests correctly.
+
+Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
+---
+ t/lib/OpenQA/SeleniumTest.pm | 4 +---
+ t/ui/27-plugin_obs_rsync_status_details.t | 3 ++-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/t/lib/OpenQA/SeleniumTest.pm b/t/lib/OpenQA/SeleniumTest.pm
+index cad768a52..86d08f53e 100644
+--- a/t/lib/OpenQA/SeleniumTest.pm
++++ b/t/lib/OpenQA/SeleniumTest.pm
+@@ -352,9 +352,7 @@ sub get_mojoport () { $mojoport }
+ # uncoverable subroutine
+ # uncoverable statement
+ sub driver_missing () {
+- diag 'Install Selenium::Remote::Driver and Selenium::Chrome to run these tests'; # uncoverable statement
+- done_testing; # uncoverable statement
+- exit; # uncoverable statement
++ plan skip_all => 'Install Selenium::Remote::Driver and Selenium::Chrome to run these tests'; # uncoverable statement
+ }
+
+ END {
+diff --git a/t/ui/27-plugin_obs_rsync_status_details.t b/t/ui/27-plugin_obs_rsync_status_details.t
+index 89efcb4e2..379bed6a7 100644
+--- a/t/ui/27-plugin_obs_rsync_status_details.t
++++ b/t/ui/27-plugin_obs_rsync_status_details.t
+@@ -11,8 +11,9 @@ use OpenQA::Test::TimeLimit '60';
+ use OpenQA::SeleniumTest;
+ use OpenQA::Test::ObsRsync 'setup_obs_rsync_test';
+
++driver_missing unless check_driver_modules;
+ my ($t, $tempdir) = setup_obs_rsync_test(fixtures_glob => '01-jobs.pl 03-users.pl');
+-driver_missing unless my $driver = call_driver();
++my $driver = call_driver();
+ $driver->find_element_by_class('navbar-brand')->click;
+ $driver->find_element_by_link_text('Login')->click;
+
+--
+2.41.0
+
https://src.fedoraproject.org/rpms/openqa/c/ae3b55a30cf9fa78de2bd91e0cacb...
6Â months, 1Â week