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 0b9f57cd9f0a3a932b4001f01cb1ff3ca0eda14f..d5fb13fb0e5c32b657122823859c90613eb22204 100644 (file)
--- 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 e99eb8ed4bee0267ede53d815390fdaf2c3bca76..6882486a6268d94ca007c9e0bc19d721d9332a69 100644 (file)
--- 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 384e9fa53c25d033027389e2ca75ab9d201c1037..499543b60ca821aad81c7a4924a6f22adb96759c 100644 (file)
--- 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 d410002177fb90c10013102e3f2a95a3228a0410..80548b02b48e0cef71139d5df47e637d1ad87653 100644 (file)
--- 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 {