- add underlay api implementation

[oweals/gnunet.git] / src / testing / test_testing_peerstartup2.c

diff --git a/src/testing/test_testing_peerstartup2.c b/src/testing/test_testing_peerstartup2.c
index cd8141b402d416a91b8ee28643f9b024f2ad632b..a4bdd4d65d5fc25f1fe0e629cffc96060ab72d48 100644 (file)
--- a/src/testing/test_testing_peerstartup2.c
+++ b/src/testing/test_testing_peerstartup2.c
@@ -21,13 +21,12 @@
 /**
  * @file testing/test_testing_new_peerstartup.c
  * @brief test case for testing peer startup and shutdown using new testing
- *          library 
+ *          library
  * @author Sree Harsha Totakura
  */
 
 #include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
 
 #define LOG(kind,...)                           \
@@ -43,7 +42,7 @@
       }                                         \
     }                                           \
   } while (0)                                   \
-    
+
 
 /**
  * The status of the test
@@ -59,7 +58,7 @@ struct TestingContext
    * The testing system
    */
   struct GNUNET_TESTING_System *system;
-  
+
   /**
    * The peer which has been started by the testing system
    */
@@ -95,7 +94,7 @@ do_shutdown2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (NULL != test_ctx->system)
     GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
   GNUNET_free (test_ctx);
-  
+
 }
 
 
@@ -144,14 +143,13 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_assert (NULL != test_ctx);
   if (NULL != test_ctx->peer)
   {
-    FAIL_TEST (GNUNET_OK == 
+    FAIL_TEST (GNUNET_OK ==
                GNUNET_TESTING_peer_stop_async (test_ctx->peer,
                                                &peer_status_cb,
                                                test_ctx));
-
   }
   else
-    do_shutdown (test_ctx, tc);
+    do_shutdown2 (test_ctx, tc);
 }
 
 
@@ -167,14 +165,14 @@ run (void *cls, char *const *args, const char *cfgfile,
   struct GNUNET_PeerIdentity id;
 
   test_ctx = GNUNET_malloc (sizeof (struct TestingContext));
-  test_ctx->system = 
+  test_ctx->system =
       GNUNET_TESTING_system_create ("test-gnunet-testing",
                                     "127.0.0.1", NULL, NULL);
   emsg = NULL;
   if (NULL == test_ctx->system)
     goto end;
   test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  test_ctx->peer = 
+  test_ctx->peer =
       GNUNET_TESTING_peer_configure (test_ctx->system,
                                      test_ctx->cfg,
                                      0, &id, &emsg);
@@ -187,10 +185,15 @@ run (void *cls, char *const *args, const char *cfgfile,
   if (GNUNET_OK != GNUNET_TESTING_peer_start (test_ctx->peer))
     goto end;
   test_ctx->state = PEER_STARTED;
+  FAIL_TEST (GNUNET_OK ==
+             GNUNET_TESTING_peer_stop_async (test_ctx->peer,
+                                             &peer_status_cb,
+                                             test_ctx));
+  GNUNET_TESTING_peer_stop_async_cancel (test_ctx->peer);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
                                 &do_shutdown, test_ctx);
   return;
-  
+
  end:
   FAIL_TEST (0);
   GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);