From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 1 Dec 2022 08:35:34 +0000 (+0000)
Subject: Temporarily revert to sleep in place of triggers
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=139dbb8ad212bc23b698a5a9bbde824ed8c4ecbb;p=thirdparty%2Ffreeradius-server.git

Temporarily revert to sleep in place of triggers

until issues with exec are resolved.
---

diff --git a/src/tests/ldap_sync/active_directory/all.mk b/src/tests/ldap_sync/active_directory/all.mk
index 0b9f57cd9f0..d5fb13fb0e5 100644
--- a/src/tests/ldap_sync/active_directory/all.mk
+++ b/src/tests/ldap_sync/active_directory/all.mk
@@ -36,14 +36,15 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 	$(Q)rm -f $(OUT_DIR)/$(OUT).out
 
 #	Wait for the sync to start before applying changes
-	$(Q)i=0; while [ $$i -lt 100 ] ; \
-		do if [ -e $(OUT_DIR)/sync_started ];	\
-		then					\
-		break;					\
-		fi;					\
-		sleep .1;				\
-		i=$$((i+1));				\
-	done;
+#	$(Q)i=0; while [ $$i -lt 100 ] ; \
+#		do if [ -e $(OUT_DIR)/sync_started ];	\
+#		then					\
+#		break;					\
+#		fi;					\
+#		sleep .1;				\
+#		i=$$((i+1));				\
+#	done;
+	$(Q)sleep 1
 
 	$(Q)$<
 	$(Q)i=0; while [ $$i -lt 600 ] ; \
diff --git a/src/tests/ldap_sync/active_directory/config/radiusd.conf b/src/tests/ldap_sync/active_directory/config/radiusd.conf
index e99eb8ed4be..6882486a626 100644
--- a/src/tests/ldap_sync/active_directory/config/radiusd.conf
+++ b/src/tests/ldap_sync/active_directory/config/radiusd.conf
@@ -133,9 +133,9 @@ server test {
 				&Tmp-Integer-0 = 'userAccountControl'
 			}
 
-			trigger {
-				start = "/usr/bin/touch ${run_dir}/sync_started"
-			}
+#			trigger {
+#				start = "/usr/bin/touch ${run_dir}/sync_started"
+#			}
 		}
 
 		sync {
diff --git a/src/tests/ldap_sync/persistent_search/all.mk b/src/tests/ldap_sync/persistent_search/all.mk
index 384e9fa53c2..499543b60ca 100644
--- a/src/tests/ldap_sync/persistent_search/all.mk
+++ b/src/tests/ldap_sync/persistent_search/all.mk
@@ -32,14 +32,15 @@ $(OUTPUT)/%: $(DIR)/% | $(TEST).trigger_clear $(TEST).radiusd_kill $(TEST).radiu
 	$(Q)rm -f $(OUT_DIR)/$(OUT).out
 
 #	Wait for the sync to start before applying changes
-	$(Q)i=0; while [ $$i -lt 100 ] ; \
-		do if [ -e $(OUT_DIR)/sync_started ] ;	\
-		then					\
-		break;					\
-		fi;					\
-		sleep .1;				\
-		i=$$((i+1));				\
-	done;
+#	$(Q)i=0; while [ $$i -lt 100 ] ; \
+#		do if [ -e $(OUT_DIR)/sync_started ] ;	\
+#		then					\
+#		break;					\
+#		fi;					\
+#		sleep .1;				\
+#		i=$$((i+1));				\
+#	done;
+	$(Q)sleep 1
 
 	$(Q)ldapmodify $(ARGV) -f $< > /dev/null
 	$(Q)i=0; while [ $$i -lt 600 ] ; \
diff --git a/src/tests/ldap_sync/persistent_search/config/radiusd.conf b/src/tests/ldap_sync/persistent_search/config/radiusd.conf
index d410002177f..80548b02b48 100644
--- a/src/tests/ldap_sync/persistent_search/config/radiusd.conf
+++ b/src/tests/ldap_sync/persistent_search/config/radiusd.conf
@@ -145,9 +145,9 @@ server test {
 				&Password.With-Header = 'userPassword'
 			}
 
-			trigger {
-				start = "/usr/bin/touch ${run_dir}/sync_started"
-			}
+#			trigger {
+#				start = "/usr/bin/touch ${run_dir}/sync_started"
+#			}
 		}
 
 		sync {