plugin datastore mysql

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

diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c
index 5938791888fa7aa4d35c56eb776f6a759552c4fe..0999020a8352a39b4e171e19e683a456343d322a 100644 (file)
--- a/src/testbed/test_testbed_api_hosts.c
+++ b/src/testbed/test_testbed_api_hosts.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2013 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008--2013 GNUnet e.V.
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
       You should have received a copy of the GNU General Public License
       along with GNUnet; see the file COPYING.  If not, write to the
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
  */
 
 /**
@@ -58,19 +58,14 @@ static unsigned int num_hosts;
  */
 static int status;
 
-/**
- * Shutdown task identifier
- */
-GNUNET_SCHEDULER_TaskIdentifier shutdown_id;
 
 /**
  * The shutdown task
  *
  * @param cls NULL
- * @param tc the task context
  */
 static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
   GNUNET_TESTBED_host_destroy (host);
   while (0 != num_hosts)
@@ -118,7 +113,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   {
     if (cnt < 3)
     {
-      GNUNET_assert (0 == strcmp ("totakura", 
+      GNUNET_assert (0 == strcmp ("totakura",
                                   GNUNET_TESTBED_host_get_username_
                                   (hosts[cnt])));
       GNUNET_assert (NULL != GNUNET_TESTBED_host_get_hostname (hosts[cnt]));
@@ -126,7 +121,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
     if (3 == cnt)
     {
-      GNUNET_assert (0 == strcmp ("totakura", 
+      GNUNET_assert (0 == strcmp ("totakura",
                                   GNUNET_TESTBED_host_get_username_
                                   (hosts[cnt])));
       GNUNET_assert (NULL != GNUNET_TESTBED_host_get_hostname (hosts[cnt]));
@@ -134,10 +129,10 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
     if (4 == cnt)
     {
-      GNUNET_assert (0 == strcmp ("totakura", 
+      GNUNET_assert (0 == strcmp ("totakura",
                                   GNUNET_TESTBED_host_get_username_
                                   (hosts[cnt])));
-      GNUNET_assert (0 == strcmp ("asgard",
+      GNUNET_assert (0 == strcmp ("asgard.realm",
                                   GNUNET_TESTBED_host_get_hostname
                                   (hosts[cnt])));
       GNUNET_assert (22 == GNUNET_TESTBED_host_get_ssh_port_ (hosts[cnt]));
@@ -160,8 +155,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
   }
   status = GNUNET_YES;
-  shutdown_id =
-      GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (0), &do_shutdown, NULL);
+  GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
 }