- distribute peers equally among island nodes on SuperMUC

[oweals/gnunet.git] / src / testbed / test_testbed_api.c

diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 2927c3798bcf496d590cd81b7a95d671820f9ccd..a82f488548fff004a95952240ac712161ec29122 100644 (file)
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2012 Christian Grothoff (and other contributing authors)
+      (C) 2008--2013 Christian Grothoff (and other contributing authors)
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -223,7 +223,7 @@ dht_disconnect_adapter (void *cls, void *op_result)
   dht_handle = NULL;
   FAIL_TEST (PEER_SERVICE_CONNECT == sub_test, return);
   FAIL_TEST (NULL != operation, return);
-  operation = GNUNET_TESTBED_peer_stop (peer, NULL, NULL);
+  operation = GNUNET_TESTBED_peer_stop (NULL, peer, NULL, NULL);
   FAIL_TEST (NULL != operation, return);
 }
 
@@ -307,16 +307,16 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     switch (sub_test)
     {
     case PEER_DESTROY:
-      FAIL_TEST (event->details.operation_finished.operation == operation, return);
-      FAIL_TEST (NULL == event->details.operation_finished.op_cls, return);
+      FAIL_TEST (event->op == operation, return);
+      FAIL_TEST (NULL == event->op_cls, return);
       FAIL_TEST (NULL == event->details.operation_finished.emsg, return);
       FAIL_TEST (NULL == event->details.operation_finished.generic, return);
       GNUNET_TESTBED_operation_done (operation);
       GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
       break;
     case PEER_SERVICE_CONNECT:
-      FAIL_TEST (event->details.operation_finished.operation == operation, return);
-      FAIL_TEST (NULL == event->details.operation_finished.op_cls, return);
+      FAIL_TEST (event->op == operation, return);
+      FAIL_TEST (NULL == event->op_cls, return);
       FAIL_TEST (NULL == event->details.operation_finished.emsg, return);
       FAIL_TEST (NULL != dht_handle, return);
       FAIL_TEST (event->details.operation_finished.generic == dht_handle, return);
@@ -423,7 +423,7 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg_, int status
   event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT);
   event_mask |= (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED);
   controller =
-      GNUNET_TESTBED_controller_connect (cfg_, host, event_mask, &controller_cb,
+      GNUNET_TESTBED_controller_connect (host, event_mask, &controller_cb,
                                          NULL);
   FAIL_TEST (NULL != controller, return);
   neighbour = GNUNET_TESTBED_host_create ("localhost", NULL, cfg, 0);
@@ -451,7 +451,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   cfg = GNUNET_CONFIGURATION_dup (config);
   host = GNUNET_TESTBED_host_create (NULL, NULL, cfg, 0);
   FAIL_TEST (NULL != host, return);
-  cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb,
+  cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, status_cb,
                                         NULL);
   abort_task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply