From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 24 Oct 2022 08:08:52 +0000 (+0100)
Subject: Amend persistent search tests to use different output files for parallel runs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98633f7bc9c8dc2df988524f3917bbad76b974eb;p=thirdparty%2Ffreeradius-server.git

Amend persistent search tests to use different output files for parallel runs
---

diff --git a/src/tests/ldap_sync/persistent_search/01_add.ldif b/src/tests/ldap_sync/persistent_search/01_add.ldif
index c6633091b10..8655365539a 100644
--- a/src/tests/ldap_sync/persistent_search/01_add.ldif
+++ b/src/tests/ldap_sync/persistent_search/01_add.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${PERSISTENT_SEARCH_TEST_SERVER} -D "cn=Directory Manager" -w "secret123"
+# OUT:peopleAddfred
 #
 dn: uid=fred,ou=people,dc=example,dc=com
 changeType: add
diff --git a/src/tests/ldap_sync/persistent_search/02_mod.ldif b/src/tests/ldap_sync/persistent_search/02_mod.ldif
index f197e50290f..4e9d9908578 100644
--- a/src/tests/ldap_sync/persistent_search/02_mod.ldif
+++ b/src/tests/ldap_sync/persistent_search/02_mod.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${PERSISTENT_SEARCH_TEST_SERVER} -D "cn=Directory Manager" -w "secret123"
+# OUT:peopleModifyjane
 #
 dn: uid=jane,ou=people,dc=example,dc=com
 changeType: modify
diff --git a/src/tests/ldap_sync/persistent_search/03_mod.ldif b/src/tests/ldap_sync/persistent_search/03_mod.ldif
index 17692898fbb..f77b3ad09e4 100644
--- a/src/tests/ldap_sync/persistent_search/03_mod.ldif
+++ b/src/tests/ldap_sync/persistent_search/03_mod.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${PERSISTENT_SEARCH_TEST_SERVER} -D "cn=Directory Manager" -w "secret123"
+# OUT:peopleModifyanne
 #
 dn: uid=ann,ou=people,dc=example,dc=com
 changeType: modrdn
diff --git a/src/tests/ldap_sync/persistent_search/04_del.ldif b/src/tests/ldap_sync/persistent_search/04_del.ldif
index 70a9965f2eb..647d38a3110 100644
--- a/src/tests/ldap_sync/persistent_search/04_del.ldif
+++ b/src/tests/ldap_sync/persistent_search/04_del.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${PERSISTENT_SEARCH_TEST_SERVER} -D "cn=Directory Manager" -w "secret123"
+# OUT:peopleDeletebill
 #
 dn: uid=bill,ou=people,dc=example,dc=com
 changetype: delete
diff --git a/src/tests/ldap_sync/persistent_search/05_add.ldif b/src/tests/ldap_sync/persistent_search/05_add.ldif
index b06d34ffc86..79fda680be3 100644
--- a/src/tests/ldap_sync/persistent_search/05_add.ldif
+++ b/src/tests/ldap_sync/persistent_search/05_add.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${PERSISTENT_SEARCH_TEST_SERVER} -D "cn=Directory Manager" -w "secret123"
+# OUT:groupAddbosses
 #
 dn: cn=bosses,ou=groups,dc=example,dc=com
 changeType: add
diff --git a/src/tests/ldap_sync/persistent_search/06_mod.ldif b/src/tests/ldap_sync/persistent_search/06_mod.ldif
index 13b4ecb0309..3dcac48096d 100644
--- a/src/tests/ldap_sync/persistent_search/06_mod.ldif
+++ b/src/tests/ldap_sync/persistent_search/06_mod.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${PERSISTENT_SEARCH_TEST_SERVER} -D "cn=Directory Manager" -w "secret123"
+# OUT:groupModifyfoo
 #
 dn: cn=foo,ou=groups,dc=example,dc=com
 changetype: modify
diff --git a/src/tests/ldap_sync/persistent_search/07_mod.ldif b/src/tests/ldap_sync/persistent_search/07_mod.ldif
index 6c3e6b8f9b2..57a19260203 100644
--- a/src/tests/ldap_sync/persistent_search/07_mod.ldif
+++ b/src/tests/ldap_sync/persistent_search/07_mod.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${PERSISTENT_SEARCH_TEST_SERVER} -D "cn=Directory Manager" -w "secret123"
+# OUT:groupModifybar
 #
 dn: cn=bar,ou=groups,dc=example,dc=com
 changetype: modify
diff --git a/src/tests/ldap_sync/persistent_search/08_del.ldif b/src/tests/ldap_sync/persistent_search/08_del.ldif
index 0bec02be7ba..0f8b2e23469 100644
--- a/src/tests/ldap_sync/persistent_search/08_del.ldif
+++ b/src/tests/ldap_sync/persistent_search/08_del.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${PERSISTENT_SEARCH_TEST_SERVER} -D "cn=Directory Manager" -w "secret123"
+# OUT:groupDeletebaz
 #
 dn: cn=baz,ou=groups,dc=example,dc=com
 changetype: delete
diff --git a/src/tests/ldap_sync/persistent_search/all.mk b/src/tests/ldap_sync/persistent_search/all.mk
index ca73d366790..f30e34c8226 100644
--- a/src/tests/ldap_sync/persistent_search/all.mk
+++ b/src/tests/ldap_sync/persistent_search/all.mk
@@ -22,13 +22,15 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
 	$(eval FOUND    := $(patsubst %.ldif,%.out,$@))
 	$(eval ARGV     := $(shell grep "#.*ARGV:" $< | cut -f2 -d ':'))
 	$(eval OUT_DIR  := $(BUILD_DIR)/tests/ldap_sync/persistent_search)
+	$(eval OUT      := $(shell grep "#.*OUT:" $< | cut -f2 -d ':'))
 
 	$(Q)echo "LDAPSYNC-TEST persistent_search $(TARGET)"
 	$(Q)[ -f $(dir $@)/radiusd.pid ] || exit 1
-	$(Q)rm -f $(OUT_DIR)/linelog.out
+	$(Q)rm -f $(OUT_DIR)/$(OUT).out
+	$(Q)sleep 1
 	$(Q)ldapmodify $(ARGV) -f $< > /dev/null
-	$(Q)i=0; while [ $$i -lt 300 ] ; \
-		do if [ -e $(OUT_DIR)/linelog.out ] ;	\
+	$(Q)i=0; while [ $$i -lt 600 ] ; \
+		do if [ -e $(OUT_DIR)/$(OUT).out ] ;	\
 		then					\
 		break;					\
 		fi;					\
@@ -36,7 +38,7 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).radiusd_kill $(TEST).radiusd_start
 		i=$$((i+1));				\
 	done ;
 	$(Q)sleep .1
-	$(Q)mv $(OUT_DIR)/linelog.out $(FOUND)
+	$(Q)mv $(OUT_DIR)/$(OUT).out $(FOUND)
 
 	$(Q)if [ -e "$(EXPECTED)" ] && ! cmp -s $(FOUND) $(EXPECTED); then	\
 		echo "LDAP_SYNC FAILED $@";					\
diff --git a/src/tests/ldap_sync/persistent_search/config/radiusd.conf b/src/tests/ldap_sync/persistent_search/config/radiusd.conf
index 7c91938c572..f2321adfcdf 100644
--- a/src/tests/ldap_sync/persistent_search/config/radiusd.conf
+++ b/src/tests/ldap_sync/persistent_search/config/radiusd.conf
@@ -42,6 +42,12 @@ global {
 
 policy {
 	linelogprep {
+		&request.Tmp-String-8 := &LDAP-Sync.DN
+		if (&Tmp-String-8 == "ou=people,dc=example,dc=com") {
+			&control.Tmp-String-9 := "people"
+		} else {
+			&control.Tmp-String-9 := "group"
+		}
 		&control.Tmp-String-0 := "%{Packet-Type} %{LDAP-Sync.DN} %{LDAP-Sync.Entry-DN} %{LDAP-Sync.Original-DN} %{Proto.radius.User-Name}"
 	}
 
@@ -67,7 +73,7 @@ modules {
 		destination = file
 
 		file {
-			filename = ${run_dir}/linelog.out
+			filename = ${run_dir}/%{control.Tmp-String-9}%{Packet-Type}%{Proto.radius.User-Name}%{Tmp-String-2}.out
 		}
 	}
 
@@ -143,6 +149,7 @@ server test {
 
 			update {
 				&Tmp-String-1 += "member"
+				&Tmp-String-2 = 'cn'
 			}
 		}
 	}