Notification time stamped 2022-03-31 21:43:50 UTC
From 3dd45e6c30ccb9f417d3cc091f5fcc673b06db95 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mar 27 2022 12:33:06 +0000
Subject: Disable xvfb tests by default because they may hang in koji
---
diff --git a/python-keyring.spec b/python-keyring.spec
index 827c3d3..53cf9b3 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -1,4 +1,6 @@
%bcond_without tests
+# The xvfb tests sometimes hang in koji.
+%bcond_with xvfb_tests
Name: python-keyring
Version: 23.5.0
@@ -21,6 +23,7 @@ BuildRequires: python3dist(jeepney)
BuildRequires: python3dist(importlib-metadata)
# setup.cfg: [testing] extra (but without linting/typechecking/coverage)
BuildRequires: python3dist(pytest)
+%if %{with xvfb_tests}
# Run graphical tests in non-graphical build environment.
BuildRequires: xorg-x11-server-Xvfb
# Enable libsecret backend
@@ -29,6 +32,7 @@ BuildRequires: libsecret
BuildRequires: gnome-keyring
BuildRequires: /usr/bin/dbus-launch
%endif
+%endif
%global desc %{expand: \
The Python keyring library provides an easy way to access the system keyring
@@ -82,7 +86,9 @@ ln -s keyring %{buildroot}%{_bindir}/keyring-python3
#
https://github.com/jaraco/keyring/issues/526
k="${k-}${k+ and }not test_entry_point"
+%if %{with xvfb_tests}
%global __pytest /usr/bin/xvfb-run -a /usr/bin/pytest
+%endif
%pytest -k "${k-}"
%endif
@@ -103,7 +109,8 @@ k="${k-}${k+ and }not test_entry_point"
- Update to 23.5.0 (close RHBZ#1920125)
- Drop EPEL8 compatibility in the Fedora spec file: this upstream release
requires setuptools features not available in EPEL8
-- Use xvfb to run the tests for the libsecret backend
+- Allow using xvfb to run the tests for the libsecret backend; disable by
+ default because tests occasionally hang in koji when doing so
* Tue Mar 22 2022 Benjamin A. Beasley <code(a)musicinmybrain.net> - 21.8.0-6
- Drop workarounds for EPEL7 and for EOL Fedoras
https://src.fedoraproject.org/rpms/python-keyring/c/3dd45e6c30ccb9f417d3c...