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) | |
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 7b6a765d44..410666deab 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c @@ -36,7 +36,7 @@ /** * How long until we give up on transmitting the message? */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600) #define NUM_DAEMONS 2 @@ -46,6 +46,8 @@ static struct GNUNET_FS_TestDaemon *daemons[NUM_DAEMONS]; static struct GNUNET_SCHEDULER_Handle *sched; +static int ok; + static void do_stop (void *cls, @@ -54,10 +56,18 @@ do_stop (void *cls, GNUNET_FS_TEST_daemons_stop (sched, NUM_DAEMONS, daemons); - GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Finished download, shutting down\n", - (unsigned long long) FILESIZE); + if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Finished download, shutting down\n", + (unsigned long long) FILESIZE); + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Timeout during download, shutting down with error\n"); + ok = 1; + } } @@ -156,7 +166,7 @@ main (int argc, char *argv[]) argvx, "test-gnunet-service-fs-p2p", "nohelp", options, &run, NULL); GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/"); - return 0; + return ok; } /* end of test_gnunet_service_fs_p2p.c */ |