diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-05-18 12:22:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-05-18 12:22:55 +0000 |
commit | a9b5a58a55dd8c6f4b8dc1cadd7d4639f30bb1fd (patch) | |
tree | 181b27c9ef17e52e73a3538005b055dbb0cf4fdb /src/testing | |
parent | 69d43a2fb2410f610a42c5f23510e53d03f3a968 (diff) | |
download | gnunet-a9b5a58a55dd8c6f4b8dc1cadd7d4639f30bb1fd.tar.gz gnunet-a9b5a58a55dd8c6f4b8dc1cadd7d4639f30bb1fd.zip |
fixes, comments
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/test_testing_connect.c | 4 | ||||
-rw-r--r-- | src/testing/test_testing_group.c | 2 | ||||
-rw-r--r-- | src/testing/test_testing_topology.c | 2 | ||||
-rw-r--r-- | src/testing/testing.c | 2 | ||||
-rw-r--r-- | src/testing/testing_group.c | 2 |
5 files changed, 3 insertions, 9 deletions
diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c index 3ddb9dbac..2857b7a4f 100644 --- a/src/testing/test_testing_connect.c +++ b/src/testing/test_testing_connect.c | |||
@@ -188,10 +188,6 @@ main (int argc, char *argv[]) | |||
188 | #endif | 188 | #endif |
189 | NULL); | 189 | NULL); |
190 | ret = check (); | 190 | ret = check (); |
191 | /*sleep (1); | ||
192 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing"); | ||
193 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing-connect-peer1"); | ||
194 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing-connect-peer2");*/ | ||
195 | return ret; | 191 | return ret; |
196 | } | 192 | } |
197 | 193 | ||
diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c index f222fbb82..81d949e2a 100644 --- a/src/testing/test_testing_group.c +++ b/src/testing/test_testing_group.c | |||
@@ -65,10 +65,8 @@ my_cb (void *cls, | |||
65 | } | 65 | } |
66 | 66 | ||
67 | peers_left--; | 67 | peers_left--; |
68 | fprintf(stderr, "peers_left is %d, failed_peers is %d\n", peers_left, failed_peers); | ||
69 | if (peers_left == 0) | 68 | if (peers_left == 0) |
70 | { | 69 | { |
71 | sleep(2); /* Give other services a chance to initialize before killing */ | ||
72 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started successfully, ending test!\n"); | 70 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started successfully, ending test!\n"); |
73 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); | 71 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); |
74 | ok = 0; | 72 | ok = 0; |
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index 50ee0086a..56d3baea6 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "gnunet_testing_lib.h" | 25 | #include "gnunet_testing_lib.h" |
26 | #include "gnunet_core_service.h" | 26 | #include "gnunet_core_service.h" |
27 | 27 | ||
28 | #define VERBOSE GNUNET_YES | 28 | #define VERBOSE GNUNET_NO |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * How long until we fail the whole testcase? | 31 | * How long until we fail the whole testcase? |
diff --git a/src/testing/testing.c b/src/testing/testing.c index 82abbdd97..a04c6c2de 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -544,7 +544,6 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
544 | return; | 544 | return; |
545 | } | 545 | } |
546 | /* wait some more */ | 546 | /* wait some more */ |
547 | fprintf(stderr, "scheduling in shutdown_start\n"); | ||
548 | d->task | 547 | d->task |
549 | = GNUNET_SCHEDULER_add_delayed (d->sched, | 548 | = GNUNET_SCHEDULER_add_delayed (d->sched, |
550 | GNUNET_CONSTANTS_EXEC_WAIT, | 549 | GNUNET_CONSTANTS_EXEC_WAIT, |
@@ -1020,7 +1019,6 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d, | |||
1020 | 1019 | ||
1021 | GNUNET_free_non_null(del_arg); | 1020 | GNUNET_free_non_null(del_arg); |
1022 | d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout); | 1021 | d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout); |
1023 | fprintf(stderr, "scheduling shutdown fsm phase\n"); | ||
1024 | d->task | 1022 | d->task |
1025 | = GNUNET_SCHEDULER_add_now (d->sched, | 1023 | = GNUNET_SCHEDULER_add_now (d->sched, |
1026 | &start_fsm, d); | 1024 | &start_fsm, d); |
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index aa1d5da69..d77738296 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -1396,6 +1396,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg) | |||
1396 | count++; | 1396 | count++; |
1397 | if (ret == GNUNET_SYSERR) | 1397 | if (ret == GNUNET_SYSERR) |
1398 | { | 1398 | { |
1399 | /* FIXME: why sleep here? -CG */ | ||
1399 | sleep(1); | 1400 | sleep(1); |
1400 | } | 1401 | } |
1401 | } | 1402 | } |
@@ -1547,6 +1548,7 @@ create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg, char *tran | |||
1547 | count++; | 1548 | count++; |
1548 | if (ret == GNUNET_SYSERR) | 1549 | if (ret == GNUNET_SYSERR) |
1549 | { | 1550 | { |
1551 | /* FIXME: why sleep here? -CG */ | ||
1550 | sleep(1); | 1552 | sleep(1); |
1551 | } | 1553 | } |
1552 | } | 1554 | } |