Blob Blame History Raw
From e48cdfb69b43964d5472bdf011af59343c719a06 Mon Sep 17 00:00:00 2001
From: Tomas Halman <thalman@redhat.com>
Date: Thu, 5 Sep 2019 09:30:04 +0200
Subject: [PATCH 92/92] TESTS: adapt tests to enabled default files domain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some tests expect that SSSD is compiled with --enable-files-domain
option (test_no_sssd_conf). But having this enabled by default
breaks some other tests.

This patch adds --enable-files-domain to test build and explicitly
disables the domain in configuration of some tests (ldap, enumeration).

Resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=1713352

Reviewed-by: Michal Židek <mzidek@redhat.com>
---
 Makefile.am                        | 2 ++
 src/tests/intg/test_enumeration.py | 1 +
 src/tests/intg/test_ldap.py        | 1 +
 3 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index bc74906a7..45a042624 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3766,6 +3766,8 @@ intgcheck-prepare:
 	    --enable-intgcheck-reqs \
 	    --without-semanage \
 	    --with-session-recording-shell=/bin/false \
+	    --enable-local-provider \
+	    --enable-files-domain \
 	    $(INTGCHECK_CONFIGURE_FLAGS) \
 	    CFLAGS="-O2 -g $$CFLAGS -DKCM_PEER_UID=$$(id -u)"; \
 	$(MAKE) $(AM_MAKEFLAGS) ; \
diff --git a/src/tests/intg/test_enumeration.py b/src/tests/intg/test_enumeration.py
index 669fd86c7..c105c6df0 100644
--- a/src/tests/intg/test_enumeration.py
+++ b/src/tests/intg/test_enumeration.py
@@ -113,6 +113,7 @@ def format_basic_conf(ldap_conn, schema):
         debug_level         = 0xffff
         domains             = LDAP
         services            = nss, pam
+        enable_files_domain = false
 
         [nss]
         debug_level         = 0xffff
diff --git a/src/tests/intg/test_ldap.py b/src/tests/intg/test_ldap.py
index 787255f92..c432068f9 100644
--- a/src/tests/intg/test_ldap.py
+++ b/src/tests/intg/test_ldap.py
@@ -117,6 +117,7 @@ def format_basic_conf(ldap_conn, schema):
         debug_level         = 0xffff
         domains             = LDAP
         services            = nss, pam
+        enable_files_domain = false
 
         [nss]
         debug_level         = 0xffff
-- 
2.20.1