[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6716 - GNUnet/src/applications/fs/fsui
From: |
gnunet |
Subject: |
[GNUnet-SVN] r6716 - GNUnet/src/applications/fs/fsui |
Date: |
Wed, 16 Apr 2008 21:52:27 -0600 (MDT) |
Author: grothoff
Date: 2008-04-16 21:52:26 -0600 (Wed, 16 Apr 2008)
New Revision: 6716
Modified:
GNUnet/src/applications/fs/fsui/recursivetest.c
Log:
fixing testcase
Modified: GNUnet/src/applications/fs/fsui/recursivetest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/recursivetest.c 2008-04-16 05:25:45 UTC
(rev 6715)
+++ GNUnet/src/applications/fs/fsui/recursivetest.c 2008-04-17 03:52:26 UTC
(rev 6716)
@@ -39,6 +39,8 @@
static struct GNUNET_GE_Context *ectx;
+volatile int search_done;
+
static char *
makeName (unsigned int i)
{
@@ -216,11 +218,7 @@
printf ("Download complete.\n");
#endif
if (checkHierarchy(43, DIRECTORY_TREE_SPEC) == GNUNET_OK)
- {
- GNUNET_FSUI_search_abort (ctx, search);
- GNUNET_FSUI_search_stop (ctx, search);
- search = NULL;
- }
+ search_done = 1;
break;
case GNUNET_FSUI_download_progress:
#if DEBUG_VERBOSE > 1
@@ -352,7 +350,7 @@
search = GNUNET_FSUI_search_start (ctx, 0, uri);
CHECK (search != NULL);
prog = 0;
- while (search != NULL)
+ while (! search_done)
{
prog++;
CHECK (prog < 1000);
@@ -360,24 +358,10 @@
if (GNUNET_shutdown_test () == GNUNET_YES)
break;
}
- CHECK (search == NULL);
+ GNUNET_FSUI_search_abort (ctx, search);
+ GNUNET_FSUI_search_stop (ctx, search);
+ search = NULL;
CHECK (download != NULL);
- /* TODO: how to unindex empty directories? */
-/* waitForEvent = GNUNET_FSUI_unindex_completed;
- unindex = GNUNET_FSUI_unindex_start (ctx, fn);
- CHECK (unindex != NULL);
- prog = 0;
- while (lastEvent != GNUNET_FSUI_unindex_completed)
- {
- prog++;
- CHECK (prog < 5000);
- GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
- CHECK (lastEvent != GNUNET_FSUI_unindex_error);
- if (GNUNET_shutdown_test () == GNUNET_YES)
- break;
- }
- CHECK (lastEvent == GNUNET_FSUI_unindex_completed);*/
- /* END OF TEST CODE */
FAILURE:
if (ctx != NULL)
{
@@ -389,7 +373,7 @@
GNUNET_FSUI_search_stop (ctx, search);
GNUNET_FSUI_stop (ctx);
}
- if (fn != NULL)
+ if (fn != NULL)
{
GNUNET_disk_directory_remove (NULL, fn);
GNUNET_free (fn);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6716 - GNUnet/src/applications/fs/fsui,
gnunet <=