Notification time stamped 2022-03-31 21:43:50 UTC
From aa0c69fd2e52248b152ee21d992b6ddfa8ac8034 Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mar 24 2022 22:04:41 +0000
Subject: Use xvfb to run the tests for the libsecret backend
---
diff --git a/python-keyring.spec b/python-keyring.spec
index 039b94c..827c3d3 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -21,6 +21,13 @@ BuildRequires: python3dist(jeepney)
BuildRequires: python3dist(importlib-metadata)
# setup.cfg: [testing] extra (but without linting/typechecking/coverage)
BuildRequires: python3dist(pytest)
+# Run graphical tests in non-graphical build environment.
+BuildRequires: xorg-x11-server-Xvfb
+# Enable libsecret backend
+BuildRequires: python3-gobject
+BuildRequires: libsecret
+BuildRequires: gnome-keyring
+BuildRequires: /usr/bin/dbus-launch
%endif
%global desc %{expand: \
@@ -69,20 +76,13 @@ ln -s keyring %{buildroot}%{_bindir}/keyring-python3
%check
%if %{with tests}
-# We could run graphical tests with:
-# BuildRequires: xorg-x11-server-Xvfb
-# and
-# %%global __pytest /usr/bin/xvfb-run -a /usr/bin/pytest
-# but without a SecretService or KWallet daemon to communicate with, this still
-# won’t allow any more tests to be executed. Fortunately, we can still run some
-# of the tests, and those that can’t be run are automatically skipped.
-
# This fails because it finds two EntryPoint instances. Replicating the test in
# with the final installed RPM produces only one, as the test is expecting, so
# this seems to be an artifact of the build environment. See upstream issue:
#
https://github.com/jaraco/keyring/issues/526
k="${k-}${k+ and }not test_entry_point"
+%global __pytest /usr/bin/xvfb-run -a /usr/bin/pytest
%pytest -k "${k-}"
%endif
@@ -103,6 +103,7 @@ 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
* 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/aa0c69fd2e52248b152ee...