X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Ftest_testbed_api_peers_manage_services.c;h=63c089e1995db054603483afbeb2715e1dba549f;hb=db9c68c76d7a9eb3f200df9d0fcaf971387cb061;hp=cccccd207299995b5e038bd285d3156fa118429e;hpb=8eb1702f2a5944ebdccae9d9e37b58e6fec290cc;p=oweals%2Fgnunet.git

diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c
index cccccd207..63c089e19 100644
--- a/src/testbed/test_testbed_api_peers_manage_services.c
+++ b/src/testbed/test_testbed_api_peers_manage_services.c
@@ -22,11 +22,11 @@
  * @file testbed/test_testbed_api_peers_manage_services.c
  * @brief testcase for testing GNUNET_TESTBED_peer_manage_service()
  *          implementation
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_testbed_service.h"
 
 /**
@@ -68,7 +68,7 @@ enum {
    * Peers have been started
    */
   STATE_PEERS_STARTED,
-  
+
   /**
    * statistics service went down
    */
@@ -108,10 +108,10 @@ enum {
 static void
 do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test timed out -- Aborting\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n");
   abort_task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != op)
-  {  
+  {
     GNUNET_TESTBED_operation_done (op);
     op = NULL;
   }
@@ -142,10 +142,11 @@ op_comp_cb (void *cls,
     state = STATE_SERVICE_DOWN;
     op = GNUNET_TESTBED_peer_manage_service (dummy_cls,
                                              peers[1],
-                                             "statistics",
+                                             "topology",
                                              op_comp_cb,
                                              dummy_cls,
-                                             1);
+                                             0);
+    GNUNET_assert (NULL != op);
     break;
   case STATE_SERVICE_DOWN:
     state = STATE_SERVICE_UP;
@@ -164,6 +165,7 @@ op_comp_cb (void *cls,
  * Signature of a main function for a testcase.
  *
  * @param cls closure
+ * @param h the run handle
  * @param num_peers number of peers in 'peers'
  * @param peers_ handle to peers run in the testbed
  * @param links_succeeded the number of overlay link connection attempts that
@@ -172,7 +174,9 @@ op_comp_cb (void *cls,
  *          failed
  */
 static void
-test_master (void *cls, unsigned int num_peers,
+test_master (void *cls,
+             struct GNUNET_TESTBED_RunHandle *h,
+             unsigned int num_peers,
              struct GNUNET_TESTBED_Peer **peers_,
              unsigned int links_succeeded,
              unsigned int links_failed)
@@ -182,10 +186,10 @@ test_master (void *cls, unsigned int num_peers,
   peers = peers_;
   op = GNUNET_TESTBED_peer_manage_service (dummy_cls,
                                            peers[1],
-                                           "statistics",
+                                           "topology",
                                            op_comp_cb,
                                            dummy_cls,
-                                           0);
+                                           1);
   FAIL_TEST (NULL != op, return);
   abort_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                              (GNUNET_TIME_UNIT_MINUTES, 1),
@@ -200,8 +204,8 @@ int
 main (int argc, char **argv)
 {
   state = STATE_INIT;
-  (void) GNUNET_TESTBED_test_run ("test_testbed_api_statistics",
-                                  "test_testbed_api_statistics.conf",
+  (void) GNUNET_TESTBED_test_run ("test_testbed_api_peers_manage_services",
+                                  "test_testbed_api.conf",
                                   NUM_PEERS,
                                   1LL, NULL, NULL,
                                   &test_master, NULL);