From e253ed6e7e5ac2a113b6dbc762258f358c9ca5ae Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Thu, 10 Mar 2011 11:58:22 +0000 Subject: [PATCH] remove core connect call, add core to defaultservices for test case --- src/testing/test_testing_connect_peer1.conf | 3 ++- src/testing/test_testing_connect_peer2.conf | 3 ++- src/testing/test_testing_data.conf | 2 +- src/testing/testing.c | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf index ab2cfb66c..11938839a 100644 --- a/src/testing/test_testing_connect_peer1.conf +++ b/src/testing/test_testing_connect_peer1.conf @@ -19,7 +19,8 @@ PLUGINS = tcp PORT = 12566 UNIXPATH = /tmp/gnunet-p1-service-arm.sock HOSTNAME = localhost -DEFAULTSERVICES = +DEFAULTSERVICES = core +# core in DEFAULTSERVICES required or test case will fail! #DEBUG = YES [statistics] diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf index 7730c3393..6996f4f9c 100644 --- a/src/testing/test_testing_connect_peer2.conf +++ b/src/testing/test_testing_connect_peer2.conf @@ -18,7 +18,8 @@ PLUGINS = tcp [arm] PORT = 22566 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -DEFAULTSERVICES = +DEFAULTSERVICES = core +#core in DEFAULTSERVICES required or test case will fail! HOSTNAME = localhost #DEBUG = YES diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf index a7a7be4ec..10231c2a4 100644 --- a/src/testing/test_testing_data.conf +++ b/src/testing/test_testing_data.conf @@ -13,7 +13,7 @@ PLUGINS = tcp [arm] PORT = 2566 -DEFAULTSERVICES = +DEFAULTSERVICES = core [statistics] PORT = 2567 diff --git a/src/testing/testing.c b/src/testing/testing.c index ba2b496db..1bd88ddc0 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -2031,7 +2031,6 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, /* Core is up! Iterate over all _known_ peers first to check if we are already connected to the peer! */ GNUNET_assert(GNUNET_OK == GNUNET_CORE_is_peer_connected (ctx->d1->cfg, &ctx->d2->id, &core_initial_iteration, ctx)); - GNUNET_assert(GNUNET_OK == GNUNET_CORE_is_peer_connected (ctx->d2->cfg, &ctx->d1->id, NULL, NULL)); /*GNUNET_assert(GNUNET_OK == GNUNET_CORE_iterate_peers (ctx->d1->cfg, &core_initial_iteration, ctx));*/ } -- 2.25.1