get rid of (most) unnecessary sleeps

7 files changed, 2 insertions, 7 deletions

diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index 4b940e8dc..f528203ad 100644
--- a/src/fs/test_fs_download.c
+++ b/src/fs/test_fs_download.c
@@ -29,7 +29,7 @@
 #include "gnunet_arm_service.h"
 #include "gnunet_fs_service.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define START_ARM GNUNET_YES
 
diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index ba0906c81..60dca2ec4 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -205,7 +205,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
-  sleep (1);                    /* allow ARM to start */
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 90286067d..d0db8dfcf 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -66,7 +66,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
-  sleep (1);                    /* allow ARM to start */
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c
index 46a2dc3da..b51fb1cba 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/fs/test_fs_publish.c
@@ -194,7 +194,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
-  sleep (1);                    /* allow ARM to start */
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index 2ef323317..973018b04 100644
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -196,7 +196,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
-  sleep (1);                    /* allow ARM to start */
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c
index eac14b070..a6f902962 100644
--- a/src/fs/test_fs_start_stop.c
+++ b/src/fs/test_fs_start_stop.c
@@ -63,7 +63,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
-  sleep (1);                    /* allow ARM to start */
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
@@ -104,6 +103,7 @@ run (void *cls,
                         GNUNET_FS_FLAGS_NONE,
                         GNUNET_FS_OPTIONS_END);
   GNUNET_assert (NULL != fs); 
+  sleep (1); /* FIXME */
   GNUNET_FS_stop (fs);
 }
 
diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c
index 4c751c9a6..b8fac3b12 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/fs/test_fs_unindex.c
@@ -202,7 +202,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
-  sleep (1);                    /* allow ARM to start */
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
   GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);