1 files changed, 24 insertions, 13 deletions

diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/peerstore/test_peerstore_api_sync.c
index b2ac860b7..bfeae6ed8 100644
--- a/src/peerstore/test_peerstore_api_sync.c
+++ b/src/peerstore/test_peerstore_api_sync.c
@@ -117,6 +117,28 @@ test_cont (void *cls)
                             NULL);
 }
 
+static void
+disc_cont (void *cls)
+{
+  GNUNET_PEERSTORE_disconnect (h, GNUNET_YES);
+  h = NULL;
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                &test_cont,
+                                NULL);
+}
+
+static void
+store_cont (void *cls, int success)
+{
+  ok = success;
+  /* We need to wait a little bit to give the disconnect
+     a chance to actually finish the operation; otherwise,
+     the test may fail non-deterministically if the new
+     connection is faster than the cleanup routine of the
+     old one. */
+  GNUNET_SCHEDULER_add_now (&disc_cont,
+                            NULL);
+}
 
 /**
  * Actually run the test.
@@ -132,18 +154,7 @@ test1 ()
                           val, strlen (val) + 1,
                           GNUNET_TIME_UNIT_FOREVER_ABS,
                           GNUNET_PEERSTORE_STOREOPTION_REPLACE,
-                          NULL, NULL);
-  GNUNET_PEERSTORE_disconnect (h,
-                               GNUNET_YES);
-  h = NULL;
-  /* We need to wait a little bit to give the disconnect
-     a chance to actually finish the operation; otherwise,
-     the test may fail non-deterministically if the new
-     connection is faster than the cleanup routine of the
-     old one. */
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                &test_cont,
-                                NULL);
+                          &store_cont, NULL);
 }
 
 
@@ -171,7 +182,7 @@ main (int argc, char *argv[])
   if (0 !=
       GNUNET_TESTING_service_run ("test-gnunet-peerstore-sync",
                                   "peerstore",
-                                  "test_peerstore_api_data.conf",
+                                  "peerstore.conf",
                                   &run, NULL))
     return 1;
   if (0 != ok)