packages/realmd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix test timeout

Browse Source
This commit is contained in:
Liquor 2021-02-07 11:16:56 +08:00
parent 77b44452f5
commit c18d86f1f4
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backport-Fix-for-ini-config-test-issue.patch Normal file
View File

@ -0,0 +1,32 @@
From f2162c30155eb0d9f7475f583856a2675ad2c881 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Fri, 3 Jul 2020 17:18:13 +0200
Subject: [PATCH] Fix for ini-config test issue
Recently I came across some issues with the ini-config tests where the
test run into a deadlock and didn't finish. It looks it happens
somewhere in the glib inotify code and might be a timing issues because
I never saw the issue when running the tests with strace.
To get around the issue I added REALM_INI_NO_WATCH to not use the
inotify code for testing.
---
tests/test-ini-config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test-ini-config.c b/tests/test-ini-config.c
index 7799e13..854df88 100644
--- a/tests/test-ini-config.c
+++ b/tests/test-ini-config.c
@@ -29,7 +29,7 @@ static void
setup (Test *test,
gconstpointer unused)
{
- test->config = realm_ini_config_new (REALM_INI_LINE_CONTINUATIONS);
+ test->config = realm_ini_config_new (REALM_INI_NO_WATCH | REALM_INI_LINE_CONTINUATIONS);
}
static void
--
2.27.0

16
realmd.spec
View File

@ -1,15 +1,17 @@
%define _hardened_build 1
Name: realmd
Version: 0.16.3
Release: 22
Release: 23
Summary: AD integration detection
License: LGPLv2+
URL: https://cgit.freedesktop.org/realmd/realmd/
Source0: https://www.freedesktop.org/software/realmd/releases/realmd-%{version}.tar.gz
Patch0001: 0001-tests-run-tests-with-python3.patch
Patch0002: 0001-tests-ignore-order-in-test_update_domain.patch
Patch0003: 0001-Remove-support-for-deprecated-gtester-format.patch
Patch1: 0001-tests-run-tests-with-python3.patch
Patch2: 0001-tests-ignore-order-in-test_update_domain.patch
Patch3: 0001-Remove-support-for-deprecated-gtester-format.patch
Patch4: backport-Fix-for-ini-config-test-issue.patch
Patch9000: fix-build-bug-with-distro-of-openeuler.patch
BuildRequires: gcc automake autoconf intltool pkgconfig gettext-devel glib2-devel >= 2.32.0
@ -58,6 +60,12 @@ make check
%{_mandir}/man5/*
%changelog
* Sun Feb 7 2021 lirui <lirui130@huawei.com> - 0.16.3-23
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:fix test timeout
* Wed Jul 24 2020 yu_boyun <yuboyun@huawei.com> - 0.16.3-22
- Type:bugfix
- Id:NA