diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-03-09 20:05:24 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-03-09 20:05:24 +0000 |
commit | 7f2c055f58d41035042c8bf543d70a9ec4baf3be (patch) | |
tree | 1bb3d46b33f2f7b645f8e721b3a70b3eda77e4f9 /src/fs/test_gnunet_service_fs_p2p.c | |
parent | 5dcf7a152a31c6fb7ad148a1e6a2978bb920925b (diff) | |
download | gnunet-7f2c055f58d41035042c8bf543d70a9ec4baf3be.tar.gz gnunet-7f2c055f58d41035042c8bf543d70a9ec4baf3be.zip |
longer timeout, disconnect on zero quota
Diffstat (limited to 'src/fs/test_gnunet_service_fs_p2p.c')
-rw-r--r-- | src/fs/test_gnunet_service_fs_p2p.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index 7b6a765d4..410666dea 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c | |||
@@ -36,7 +36,7 @@ | |||
36 | /** | 36 | /** |
37 | * How long until we give up on transmitting the message? | 37 | * How long until we give up on transmitting the message? |
38 | */ | 38 | */ |
39 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) | 39 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600) |
40 | 40 | ||
41 | #define NUM_DAEMONS 2 | 41 | #define NUM_DAEMONS 2 |
42 | 42 | ||
@@ -46,6 +46,8 @@ static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS]; | |||
46 | 46 | ||
47 | static struct GNUNET_SCHEDULER_Handle *sched; | 47 | static struct GNUNET_SCHEDULER_Handle *sched; |
48 | 48 | ||
49 | static int ok; | ||
50 | |||
49 | 51 | ||
50 | static void | 52 | static void |
51 | do_stop (void *cls, | 53 | do_stop (void *cls, |
@@ -54,10 +56,18 @@ do_stop (void *cls, | |||
54 | GNUNET_FS_TEST_daemons_stop (sched, | 56 | GNUNET_FS_TEST_daemons_stop (sched, |
55 | NUM_DAEMONS, | 57 | NUM_DAEMONS, |
56 | daemons); | 58 | daemons); |
57 | GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)); | 59 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) |
58 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 60 | { |
59 | "Finished download, shutting down\n", | 61 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
60 | (unsigned long long) FILESIZE); | 62 | "Finished download, shutting down\n", |
63 | (unsigned long long) FILESIZE); | ||
64 | } | ||
65 | else | ||
66 | { | ||
67 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
68 | "Timeout during download, shutting down with error\n"); | ||
69 | ok = 1; | ||
70 | } | ||
61 | } | 71 | } |
62 | 72 | ||
63 | 73 | ||
@@ -156,7 +166,7 @@ main (int argc, char *argv[]) | |||
156 | argvx, "test-gnunet-service-fs-p2p", | 166 | argvx, "test-gnunet-service-fs-p2p", |
157 | "nohelp", options, &run, NULL); | 167 | "nohelp", options, &run, NULL); |
158 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); | 168 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); |
159 | return 0; | 169 | return ok; |
160 | } | 170 | } |
161 | 171 | ||
162 | /* end of test_gnunet_service_fs_p2p.c */ | 172 | /* end of test_gnunet_service_fs_p2p.c */ |