get rid of (most) unnecessary sleeps

diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c
index 4b940e8dcfbd479aaeca2edfefbd41af994f0853..f528203adf1180506e0b26197bf9b15ba4886c82 100644 (file)
--- 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 ba0906c8137ef464d42757916d12678874b6da66..60dca2ec4718ac704f0258f804a13c6d62dfc8f1 100644 (file)
--- 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 90286067d897a41d0403895a0d37d311fae13dd3..d0db8dfcf43484cba3960948bce37c6d1f5be196 100644 (file)
--- 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 46a2dc3da7725ae7efc86133b7dd1f95f008a252..b51fb1cbae3b0148f6972e356406961d0eb0dbde 100644 (file)
--- 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 2ef323317765db684dd47df7cd66eb49b244d808..973018b04e40fe28f393e2feb32c8036c0dc514d 100644 (file)
--- 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 eac14b070c6fd0c1be37adb2e1805590676cb328..a6f9029624ce9b5a93a3d800b43f33a519298dbb 100644 (file)
--- 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 4c751c9a65014aa51ceec2efd9a37c2ad35b3456..b8fac3b1226cc47ea42c02a6b4ac5bc2862940b5 100644 (file)
--- 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);