diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-03-10 11:58:22 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-03-10 11:58:22 +0000 |
commit | e253ed6e7e5ac2a113b6dbc762258f358c9ca5ae (patch) | |
tree | 3ee3141114c3b922ae7a864c1c882d869f6f96ca /src/testing | |
parent | 8c5eea769f6020020a4215e0243e760df1e08754 (diff) | |
download | gnunet-e253ed6e7e5ac2a113b6dbc762258f358c9ca5ae.tar.gz gnunet-e253ed6e7e5ac2a113b6dbc762258f358c9ca5ae.zip |
remove core connect call, add core to defaultservices for test case
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/test_testing_connect_peer1.conf | 3 | ||||
-rw-r--r-- | src/testing/test_testing_connect_peer2.conf | 3 | ||||
-rw-r--r-- | src/testing/test_testing_data.conf | 2 | ||||
-rw-r--r-- | 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 | |||
19 | PORT = 12566 | 19 | PORT = 12566 |
20 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 20 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
21 | HOSTNAME = localhost | 21 | HOSTNAME = localhost |
22 | DEFAULTSERVICES = | 22 | DEFAULTSERVICES = core |
23 | # core in DEFAULTSERVICES required or test case will fail! | ||
23 | #DEBUG = YES | 24 | #DEBUG = YES |
24 | 25 | ||
25 | [statistics] | 26 | [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 | |||
18 | [arm] | 18 | [arm] |
19 | PORT = 22566 | 19 | PORT = 22566 |
20 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 20 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
21 | DEFAULTSERVICES = | 21 | DEFAULTSERVICES = core |
22 | #core in DEFAULTSERVICES required or test case will fail! | ||
22 | HOSTNAME = localhost | 23 | HOSTNAME = localhost |
23 | #DEBUG = YES | 24 | #DEBUG = YES |
24 | 25 | ||
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 | |||
13 | 13 | ||
14 | [arm] | 14 | [arm] |
15 | PORT = 2566 | 15 | PORT = 2566 |
16 | DEFAULTSERVICES = | 16 | DEFAULTSERVICES = core |
17 | 17 | ||
18 | [statistics] | 18 | [statistics] |
19 | PORT = 2567 | 19 | 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, | |||
2031 | 2031 | ||
2032 | /* Core is up! Iterate over all _known_ peers first to check if we are already connected to the peer! */ | 2032 | /* Core is up! Iterate over all _known_ peers first to check if we are already connected to the peer! */ |
2033 | GNUNET_assert(GNUNET_OK == GNUNET_CORE_is_peer_connected (ctx->d1->cfg, &ctx->d2->id, &core_initial_iteration, ctx)); | 2033 | GNUNET_assert(GNUNET_OK == GNUNET_CORE_is_peer_connected (ctx->d1->cfg, &ctx->d2->id, &core_initial_iteration, ctx)); |
2034 | GNUNET_assert(GNUNET_OK == GNUNET_CORE_is_peer_connected (ctx->d2->cfg, &ctx->d1->id, NULL, NULL)); | ||
2035 | /*GNUNET_assert(GNUNET_OK == GNUNET_CORE_iterate_peers (ctx->d1->cfg, &core_initial_iteration, ctx));*/ | 2034 | /*GNUNET_assert(GNUNET_OK == GNUNET_CORE_iterate_peers (ctx->d1->cfg, &core_initial_iteration, ctx));*/ |
2036 | } | 2035 | } |
2037 | 2036 | ||