[GNUnet-SVN] r26734 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2013-04-03 14:17:03 +0200 (Wed, 03 Apr 2013)
New Revision: 26734

Modified:
   gnunet/src/testbed/gnunet-service-testbed.c
   gnunet/src/testbed/test_testbed_api_peers_manage_services.c
Log:
- use topology service instead of statistics as statistics may not terminate 
when asked for


Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2013-04-03 11:12:10 UTC (rev 
26733)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2013-04-03 12:17:03 UTC (rev 
26734)
@@ -2255,7 +2255,7 @@
     GNUNET_ARM_request_service_stop (mctx->ah, service,
                                      GST_timeout,
                                      service_manage_result_cb,
-                                     mctx);  
+                                     mctx);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
   return;
 

Modified: gnunet/src/testbed/test_testbed_api_peers_manage_services.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_peers_manage_services.c 2013-04-03 
11:12:10 UTC (rev 26733)
+++ gnunet/src/testbed/test_testbed_api_peers_manage_services.c 2013-04-03 
12:17:03 UTC (rev 26734)
@@ -108,7 +108,7 @@
 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)
   {  
@@ -142,10 +142,10 @@
     state = STATE_SERVICE_DOWN;
     op = GNUNET_TESTBED_peer_manage_service (dummy_cls,
                                              peers[1],
-                                             "statistics",
+                                             "topology",
                                              op_comp_cb,
                                              dummy_cls,
-                                             1);
+                                             0);
     break;
   case STATE_SERVICE_DOWN:
     state = STATE_SERVICE_UP;
@@ -182,10 +182,10 @@
   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 +200,8 @@
 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);