diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-09-05 21:18:45 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-09-05 21:18:45 +0000 |
commit | 563b71afee70ac213a8bb28ce0697fcbae06aac3 (patch) | |
tree | 122d6a25630f68a9845651ba2295ef68f7d2af09 /src/fs/test_gnunet_service_fs_migration.c | |
parent | cf6e2bdb1b9a5aedc4f090df853814b9df817e03 (diff) | |
download | gnunet-563b71afee70ac213a8bb28ce0697fcbae06aac3.tar.gz gnunet-563b71afee70ac213a8bb28ce0697fcbae06aac3.zip |
fixing API and clean up issues in testing
Diffstat (limited to 'src/fs/test_gnunet_service_fs_migration.c')
-rw-r--r-- | src/fs/test_gnunet_service_fs_migration.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index a5570e1d4..bbf2534d2 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c | |||
@@ -52,12 +52,19 @@ static int ok; | |||
52 | 52 | ||
53 | static struct GNUNET_TIME_Absolute start_time; | 53 | static struct GNUNET_TIME_Absolute start_time; |
54 | 54 | ||
55 | static struct GNUNET_FS_TEST_ConnectContext *cc; | ||
56 | |||
55 | static void | 57 | static void |
56 | do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 58 | do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
57 | { | 59 | { |
58 | struct GNUNET_TIME_Relative del; | 60 | struct GNUNET_TIME_Relative del; |
59 | char *fancy; | 61 | char *fancy; |
60 | 62 | ||
63 | if (NULL != cc) | ||
64 | { | ||
65 | GNUNET_FS_TEST_daemons_connect_cancel (cc); | ||
66 | cc = NULL; | ||
67 | } | ||
61 | GNUNET_FS_TEST_daemons_stop (2, daemons); | 68 | GNUNET_FS_TEST_daemons_stop (2, daemons); |
62 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) | 69 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) |
63 | { | 70 | { |
@@ -138,6 +145,7 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri) | |||
138 | static void | 145 | static void |
139 | do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 146 | do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
140 | { | 147 | { |
148 | cc = NULL; | ||
141 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) | 149 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) |
142 | { | 150 | { |
143 | GNUNET_FS_TEST_daemons_stop (2, daemons); | 151 | GNUNET_FS_TEST_daemons_stop (2, daemons); |
@@ -165,8 +173,8 @@ do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
165 | } | 173 | } |
166 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 174 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
167 | "Daemons started, will now try to connect them\n"); | 175 | "Daemons started, will now try to connect them\n"); |
168 | GNUNET_FS_TEST_daemons_connect (daemons[0], daemons[1], TIMEOUT, &do_publish, | 176 | cc = GNUNET_FS_TEST_daemons_connect (daemons[0], daemons[1], TIMEOUT, &do_publish, |
169 | NULL); | 177 | NULL); |
170 | } | 178 | } |
171 | 179 | ||
172 | 180 | ||