Use triggers to detect readiness for LDAP sync tests

Already working for rfc4533 - no reason they should have issues for
other directories.

diff --git a/src/tests/ldap_sync/active_directory/all.mk b/src/tests/ldap_sync/active_directory/all.mk
index 567c60246ddc48acf31491365226b9c4ea2d4771..2f9cc27fcc23bb9e610bb909a3af15d80ebbcbf4 100644 (file)
--- a/src/tests/ldap_sync/active_directory/all.mk
+++ b/src/tests/ldap_sync/active_directory/all.mk
@@ -36,15 +36,14 @@ $(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}sleep 1
+       ${Q}i=0; while [ $$i -lt 100 ] ; \
+               do if [ -e $(OUT_DIR)/sync_started ];   \
+               then                                    \
+               break;                                  \
+               fi;                                     \
+               sleep .1;                               \
+               i=$$((i+1));                            \
+       done;
 
        ${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 78dbfd92b7e80a5e4a8e733a56b1b228e11ad6fc..c9eac7b2ca509584f9993c0cdb86f91f7d117ccb 100644 (file)
--- a/src/tests/ldap_sync/active_directory/config/radiusd.conf
+++ b/src/tests/ldap_sync/active_directory/config/radiusd.conf
@@ -124,9 +124,9 @@ server test {
                                &SMB-Account-CTRL = '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 1c5dee42cb4244a323f01b765b3cfe86e4833572..54dc3a85aeff58a56400bf325dcc6824142a56d6 100644 (file)
--- a/src/tests/ldap_sync/persistent_search/all.mk
+++ b/src/tests/ldap_sync/persistent_search/all.mk
@@ -32,15 +32,14 @@ $(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}sleep 1
+       ${Q}i=0; while [ $$i -lt 100 ] ; \
+               do if [ -e $(OUT_DIR)/sync_started ] ;  \
+               then                                    \
+               break;                                  \
+               fi;                                     \
+               sleep .1;                               \
+               i=$$((i+1));                            \
+       done;
 
        ${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 525e4aabbc926b60d55976b7223600714b70bb00..808e517c78994834130cd92a8bf7a9264bee0ce2 100644 (file)
--- a/src/tests/ldap_sync/persistent_search/config/radiusd.conf
+++ b/src/tests/ldap_sync/persistent_search/config/radiusd.conf
@@ -143,9 +143,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 {