/*
This file is part of GNUnet
- (C) 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008, 2009, 2012 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- 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.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @file testing/test_testing_new_peerstartup.c
* @brief test case for testing peer startup and shutdown using new testing
- * library
+ * library
* @author Sree Harsha Totakura
*/
#include "platform.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_testing_lib.h"
#define LOG(kind,...) \
GNUNET_log (kind, __VA_ARGS__)
+
+#define FAIL_TEST(cond) \
+ do { \
+ if (!(cond)) { \
+ GNUNET_break (0); \
+ if (GNUNET_OK == status) { \
+ status = GNUNET_SYSERR; \
+ } \
+ } \
+ } while (0) \
+
+
/**
* The status of the test
*/
* The testing system
*/
struct GNUNET_TESTING_System *system;
-
+
/**
* The peer which has been started by the testing system
*/
* The running configuration of the peer
*/
struct GNUNET_CONFIGURATION_Handle *cfg;
+
+ /**
+ * State
+ */
+ enum {
+ PEER_INIT,
+
+ PEER_STARTED,
+
+ PEER_STOPPED
+ } state;
};
static void
-do_shutdown2 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown2 (void *cls)
{
struct TestingContext *test_ctx = cls;
if (NULL != test_ctx->system)
GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
GNUNET_free (test_ctx);
-
-}
-static void
-peer_stop_cb (void *cls, struct GNUNET_TESTING_Peer *peer, int success)
-{
- GNUNET_break (GNUNET_NO == success);
- status = GNUNET_OK;
- GNUNET_SCHEDULER_add_now (&do_shutdown2, cls);
}
* Task for shutdown
*
* @param cls the testing context
- * @param tc the tast context
*/
static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls);
+
+
+static void
+peer_status_cb (void *cls, struct GNUNET_TESTING_Peer *peer, int success)
{
struct TestingContext *test_ctx = cls;
- GNUNET_assert (NULL != test_ctx);
- if (NULL != test_ctx->peer)
+ switch (test_ctx->state)
{
- GNUNET_break (GNUNET_OK == GNUNET_TESTING_peer_stop2 (test_ctx->peer,
- &peer_stop_cb,
- test_ctx));
+ case PEER_INIT:
+ FAIL_TEST (0);
+ break;
+ case PEER_STARTED:
+ FAIL_TEST (GNUNET_YES == success);
+ test_ctx->state = PEER_STOPPED;
+ GNUNET_SCHEDULER_add_now (&do_shutdown2, cls);
+ break;
+ case PEER_STOPPED:
+ FAIL_TEST (0);
}
- else
- do_shutdown (test_ctx, tc);
}
+
+/**
+ * Task for shutdown
+ *
+ * @param cls the testing context
+ */
static void
-ps_cb (void *cls, struct GNUNET_TESTING_Peer *peer, int success)
+do_shutdown (void *cls)
{
struct TestingContext *test_ctx = cls;
- GNUNET_break (GNUNET_YES == success);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
- &do_shutdown, test_ctx);
+ GNUNET_assert (NULL != test_ctx);
+ if (NULL != test_ctx->peer)
+ {
+ FAIL_TEST (GNUNET_OK ==
+ GNUNET_TESTING_peer_stop_async (test_ctx->peer,
+ &peer_status_cb,
+ test_ctx));
+ }
+ else
+ do_shutdown2 (test_ctx);
}
char *emsg;
struct GNUNET_PeerIdentity id;
- test_ctx = GNUNET_malloc (sizeof (struct TestingContext));
- test_ctx->system =
+ test_ctx = GNUNET_new (struct TestingContext);
+ test_ctx->system =
GNUNET_TESTING_system_create ("test-gnunet-testing",
- "127.0.0.1", NULL);
+ "127.0.0.1", NULL, NULL);
emsg = NULL;
if (NULL == test_ctx->system)
goto end;
test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
- test_ctx->peer =
+ test_ctx->peer =
GNUNET_TESTING_peer_configure (test_ctx->system,
test_ctx->cfg,
0, &id, &emsg);
printf ("Test failed upon error: %s", emsg);
goto end;
}
- if (GNUNET_OK != GNUNET_TESTING_peer_start2 (test_ctx->peer,
- &ps_cb, test_ctx))
+ if (GNUNET_OK != GNUNET_TESTING_peer_start (test_ctx->peer))
goto end;
+ test_ctx->state = PEER_STARTED;
+ FAIL_TEST (GNUNET_OK ==
+ GNUNET_TESTING_peer_stop_async (test_ctx->peer,
+ &peer_status_cb,
+ test_ctx));
+ GNUNET_TESTING_peer_stop_async_cancel (test_ctx->peer);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &do_shutdown, test_ctx);
return;
-
+
end:
+ FAIL_TEST (0);
GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
GNUNET_free_non_null (emsg);
}
GNUNET_GETOPT_OPTION_END
};
- status = GNUNET_SYSERR;
+ status = GNUNET_OK;
if (GNUNET_OK !=
GNUNET_PROGRAM_run (argc, argv,
"test_testing_new_peerstartup",
projects / oweals / gnunet.git / blobdiff