/*
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
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.
*/
/**
* @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"
/**
/**
* Abort task identifier
*/
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static struct GNUNET_SCHEDULER_Task * abort_task;
/**
* States in this test
* Peers have been started
*/
STATE_PEERS_STARTED,
-
+
/**
* statistics service went down
*/
#define FAIL_TEST(cond, ret) do { \
if (!(cond)) { \
GNUNET_break(0); \
- if (GNUNET_SCHEDULER_NO_TASK != abort_task) \
+ if (NULL != abort_task) \
GNUNET_SCHEDULER_cancel (abort_task); \
abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); \
ret; \
* Abort task
*
* @param cls NULL
- * @param tc scheduler task context
*/
static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_abort (void *cls)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test timed out -- Aborting\n");
- abort_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Aborting\n");
+ abort_task = NULL;
if (NULL != op)
- {
+ {
GNUNET_TESTBED_operation_done (op);
op = NULL;
}
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;
GNUNET_SCHEDULER_cancel (abort_task);
- abort_task = GNUNET_SCHEDULER_NO_TASK;
+ abort_task = NULL;
state = STATE_OK;
GNUNET_SCHEDULER_shutdown ();
break;
* 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
* 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)
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),
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);