From: Nick Porter <nick@portercomputing.co.uk>
Date: Fri, 21 Oct 2022 16:40:42 +0000 (+0100)
Subject: Update tests to use different output filenames for parallel running
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c502cdc0b5db43be02a97092387b5219b062f446;p=thirdparty%2Ffreeradius-server.git

Update tests to use different output filenames for parallel running
---

diff --git a/src/tests/ldap_sync/rfc4533/01_add.ldif b/src/tests/ldap_sync/rfc4533/01_add.ldif
index a09c5a9fd85..3dfdc673ed5 100644
--- a/src/tests/ldap_sync/rfc4533/01_add.ldif
+++ b/src/tests/ldap_sync/rfc4533/01_add.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${RFC4533_TEST_SERVER} -D "cn=admin,dc=example,dc=com" -w "secret"
+# OUT:peopleAddfred
 #
 dn: uid=fred,ou=people,dc=example,dc=com
 changeType: add
diff --git a/src/tests/ldap_sync/rfc4533/02_mod.ldif b/src/tests/ldap_sync/rfc4533/02_mod.ldif
index ab6d72575e4..e3f70dbdbcd 100644
--- a/src/tests/ldap_sync/rfc4533/02_mod.ldif
+++ b/src/tests/ldap_sync/rfc4533/02_mod.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${RFC4533_TEST_SERVER} -D "cn=admin,dc=example,dc=com" -w "secret"
+# OUT:peopleModifyjane
 #
 dn: uid=jane,ou=people,dc=example,dc=com
 changeType: modify
diff --git a/src/tests/ldap_sync/rfc4533/03_mod.ldif b/src/tests/ldap_sync/rfc4533/03_mod.ldif
index 4d90fee25a3..b7a5e3776bc 100644
--- a/src/tests/ldap_sync/rfc4533/03_mod.ldif
+++ b/src/tests/ldap_sync/rfc4533/03_mod.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${RFC4533_TEST_SERVER} -D "cn=admin,dc=example,dc=com" -w "secret"
+# OUT:peopleModifyanne
 #
 dn: uid=ann,ou=people,dc=example,dc=com
 changeType: modrdn
diff --git a/src/tests/ldap_sync/rfc4533/04_del.ldif b/src/tests/ldap_sync/rfc4533/04_del.ldif
index c8d1463cdd4..671394ee23b 100644
--- a/src/tests/ldap_sync/rfc4533/04_del.ldif
+++ b/src/tests/ldap_sync/rfc4533/04_del.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${RFC4533_TEST_SERVER} -D "cn=admin,dc=example,dc=com" -w "secret"
+# OUT:peopleDelete
 #
 dn: uid=bill,ou=people,dc=example,dc=com
 changetype: delete
diff --git a/src/tests/ldap_sync/rfc4533/05_add.ldif b/src/tests/ldap_sync/rfc4533/05_add.ldif
index 41aa0d0a1c4..3b481ebc096 100644
--- a/src/tests/ldap_sync/rfc4533/05_add.ldif
+++ b/src/tests/ldap_sync/rfc4533/05_add.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${RFC4533_TEST_SERVER} -D "cn=admin,dc=example,dc=com" -w "secret"
+# OUT:groupAddbosses
 #
 dn: cn=bosses,ou=groups,dc=example,dc=com
 changeType: add
diff --git a/src/tests/ldap_sync/rfc4533/06_mod.ldif b/src/tests/ldap_sync/rfc4533/06_mod.ldif
index ae5da2da83c..78f6129724d 100644
--- a/src/tests/ldap_sync/rfc4533/06_mod.ldif
+++ b/src/tests/ldap_sync/rfc4533/06_mod.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${RFC4533_TEST_SERVER} -D "cn=admin,dc=example,dc=com" -w "secret"
+# OUT:groupModifyfoo
 #
 dn: cn=foo,ou=groups,dc=example,dc=com
 changetype: modify
diff --git a/src/tests/ldap_sync/rfc4533/07_mod.ldif b/src/tests/ldap_sync/rfc4533/07_mod.ldif
index a788b5e748b..9ea307e03b7 100644
--- a/src/tests/ldap_sync/rfc4533/07_mod.ldif
+++ b/src/tests/ldap_sync/rfc4533/07_mod.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${RFC4533_TEST_SERVER} -D "cn=admin,dc=example,dc=com" -w "secret"
+# OUT:groupModifybar
 #
 dn: cn=bar,ou=groups,dc=example,dc=com
 changetype: modify
diff --git a/src/tests/ldap_sync/rfc4533/08_del.ldif b/src/tests/ldap_sync/rfc4533/08_del.ldif
index 09a27a0b834..3059c8ec7c8 100644
--- a/src/tests/ldap_sync/rfc4533/08_del.ldif
+++ b/src/tests/ldap_sync/rfc4533/08_del.ldif
@@ -1,5 +1,6 @@
 #
 # ARGV: -x -H ${RFC4533_TEST_SERVER} -D "cn=admin,dc=example,dc=com" -w "secret"
+# OUT:groupDelete
 #
 dn: cn=baz,ou=groups,dc=example,dc=com
 changetype: delete
diff --git a/src/tests/ldap_sync/rfc4533/all.mk b/src/tests/ldap_sync/rfc4533/all.mk
index 2be2c16494d..f0d483775a4 100644
--- a/src/tests/ldap_sync/rfc4533/all.mk
+++ b/src/tests/ldap_sync/rfc4533/all.mk
@@ -22,14 +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/rfc4533)
+	$(eval OUT      := $(shell grep "#.*OUT:" $< | cut -f2 -d ':'))
 
 	$(Q)echo "LDAPSYNC-TEST rfc4533 $(TARGET)"
 	$(Q)[ -f $(dir $@)/radiusd.pid ] || exit 1
 	$(Q)rm -f $(OUT_DIR)/linelog.out
 	$(Q)rm -f $(OUT_DIR)/cookielog.out > /dev/null 2>&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;					\
@@ -37,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)
 
 #
 #	Cookies are not guaranteed for every update, according to the RFC,
diff --git a/src/tests/ldap_sync/rfc4533/config/radiusd.conf b/src/tests/ldap_sync/rfc4533/config/radiusd.conf
index eace6b87a7d..45bcb7920d7 100644
--- a/src/tests/ldap_sync/rfc4533/config/radiusd.conf
+++ b/src/tests/ldap_sync/rfc4533/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} %{Proto.radius.User-Name}"
 	}
 
@@ -81,7 +87,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
 		}
 	}
 
@@ -165,6 +171,7 @@ server test {
 
 			update {
 				&Tmp-String-1 += "member"
+				&Tmp-String-2 = 'cn'
 			}
 		}
 	}