diff --git a/dconf-0.40.0-tests-profile.patch b/dconf-0.40.0-tests-profile.patch new file mode 100644 index 0000000..932f3e3 --- /dev/null +++ b/dconf-0.40.0-tests-profile.patch @@ -0,0 +1,38 @@ +From c755ccd699cc0b52f73cfdae30fb7e2c3a46c8c1 Mon Sep 17 00:00:00 2001 +From: Marek Kasik +Date: Tue, 12 Nov 2024 15:23:37 +0100 +Subject: [PATCH] tests: Do not use system profile + +Set default profile containing "user-db:user" +so that tests don't use system profile. + +Fixes: #58 +--- + tests/test-dconf.py | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/tests/test-dconf.py b/tests/test-dconf.py +index 1f50da8..3ac60d3 100755 +--- a/tests/test-dconf.py ++++ b/tests/test-dconf.py +@@ -105,10 +105,17 @@ class DBusTest(unittest.TestCase): + os.mkdir(self.dbus_dir, mode=0o700) + os.mkdir(os.path.join(self.config_home, 'dconf')) + ++ os.environ['DCONF_PROFILE'] = os.path.join(self.temporary_dir.name, 'profile') + os.environ['DCONF_BLAME'] = '' + os.environ['XDG_RUNTIME_DIR'] = self.runtime_dir + os.environ['XDG_CONFIG_HOME'] = self.config_home + ++ # Configure default profile so that the system one ++ # does not affect the tests. ++ path = os.path.join(self.temporary_dir.name, 'profile') ++ with open(path, 'w') as file: ++ file.write('user-db:user') ++ + # Prepare dbus-daemon config. + dbus_daemon_config = os.path.join(self.dbus_dir, 'session.conf') + with open(dbus_daemon_config, 'w') as file: +-- +2.47.0 + diff --git a/dconf.spec b/dconf.spec index 995abe8..6ec6d1f 100644 --- a/dconf.spec +++ b/dconf.spec @@ -2,7 +2,7 @@ Name: dconf Version: 0.40.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A configuration system License: LGPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later @@ -10,6 +10,7 @@ URL: https://wiki.gnome.org/Projects/dconf Source0: https://download.gnome.org/sources/dconf/0.40/dconf-%{version}.tar.xz Patch1: dconf-override.patch +Patch2: dconf-0.40.0-tests-profile.patch BuildRequires: bash-completion BuildRequires: dbus-devel @@ -104,6 +105,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/distro.d/locks %{_datadir}/vala %changelog +* Wed Nov 20 2024 Marek Kasik - 0.40.0-15 +- Do not use system profile for tests +- Resolves: RHEL-65653 + * Tue Oct 29 2024 Troy Dawson - 0.40.0-14 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018