aboutsummaryrefslogtreecommitdiff
path: root/src/testing/testing_group.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2011-04-06 09:40:36 +0000
committerNathan S. Evans <evans@in.tum.de>2011-04-06 09:40:36 +0000
commitb24caf06a3d147b2362c210c4e7385b83c9f582b (patch)
tree29306a4e3ede82b3b68935773a769ca217232316 /src/testing/testing_group.c
parent626665da9b8b1861a1e09ca91e599ec44f915c9c (diff)
downloadgnunet-b24caf06a3d147b2362c210c4e7385b83c9f582b.tar.gz
gnunet-b24caf06a3d147b2362c210c4e7385b83c9f582b.zip
peergroup initial version with test case
Diffstat (limited to 'src/testing/testing_group.c')
-rw-r--r--src/testing/testing_group.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index e7ae32f01..9f319ca61 100644
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -2361,7 +2361,7 @@ create_clique(struct GNUNET_TESTING_PeerGroup *pg,
2361 connect_attempts = 0; 2361 connect_attempts = 0;
2362 2362
2363 conn_meter = create_meter ((((pg->total * pg->total) + pg->total) / 2) 2363 conn_meter = create_meter ((((pg->total * pg->total) + pg->total) / 2)
2364 - pg->total, "Create Clique ", GNUNET_YES); 2364 - pg->total, "Create Clique ", GNUNET_NO);
2365 for (outer_count = 0; outer_count < pg->total - 1; outer_count++) 2365 for (outer_count = 0; outer_count < pg->total - 1; outer_count++)
2366 { 2366 {
2367 for (inner_count = outer_count + 1; inner_count < pg->total; inner_count++) 2367 for (inner_count = outer_count + 1; inner_count < pg->total; inner_count++)
@@ -2375,8 +2375,6 @@ create_clique(struct GNUNET_TESTING_PeerGroup *pg,
2375 update_meter (conn_meter); 2375 update_meter (conn_meter);
2376 } 2376 }
2377 } 2377 }
2378 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Meter has %d left\n",
2379 conn_meter->total - conn_meter->completed);
2380 reset_meter (conn_meter); 2378 reset_meter (conn_meter);
2381 free_meter (conn_meter); 2379 free_meter (conn_meter);
2382 return connect_attempts; 2380 return connect_attempts;
@@ -5922,7 +5920,7 @@ GNUNET_TESTING_daemons_start(const struct GNUNET_CONFIGURATION_Handle *cfg,
5922 else 5920 else
5923 { 5921 {
5924 total_hostkeys = fs / HOSTKEYFILESIZE; 5922 total_hostkeys = fs / HOSTKEYFILESIZE;
5925 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 5923 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
5926 "Will read %llu hostkeys from file\n", total_hostkeys); 5924 "Will read %llu hostkeys from file\n", total_hostkeys);
5927 pg->hostkey_data = GNUNET_malloc_large (fs); 5925 pg->hostkey_data = GNUNET_malloc_large (fs);
5928 GNUNET_assert (fs == GNUNET_DISK_file_read (fd, pg->hostkey_data, fs)); 5926 GNUNET_assert (fs == GNUNET_DISK_file_read (fd, pg->hostkey_data, fs));