[GNUnet-SVN] r1060 - in GNUnet/src/applications/fs: ecrs fsui

[grothoff]

Author: grothoff
Date: 2005-06-26 06:38:03 -0700 (Sun, 26 Jun 2005)
New Revision: 1060

Modified:
   GNUnet/src/applications/fs/ecrs/namespacetest.c
   GNUnet/src/applications/fs/fsui/check.conf
   GNUnet/src/applications/fs/fsui/downloadtest.c
   GNUnet/src/applications/fs/fsui/fsuitest.c
   GNUnet/src/applications/fs/fsui/fsuitest2.c
   GNUnet/src/applications/fs/fsui/searchtest.c
Log:
fixes

Modified: GNUnet/src/applications/fs/ecrs/namespacetest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespacetest.c     2005-06-26 13:00:16 UTC 
(rev 1059)
+++ GNUnet/src/applications/fs/ecrs/namespacetest.c     2005-06-26 13:38:03 UTC 
(rev 1060)
@@ -111,6 +111,7 @@
     return -1;
   daemon = startGNUnetDaemon(NO);
   GNUNET_ASSERT(daemon > 0);
+  GNUNET_ASSERT(OK == waitForGNUnetDaemonRunning(30 * cronSECONDS));
   gnunet_util_sleep(5 * cronSECONDS);
   
   failureCount += testNamespace();

Modified: GNUnet/src/applications/fs/fsui/check.conf
===================================================================
--- GNUnet/src/applications/fs/fsui/check.conf  2005-06-26 13:00:16 UTC (rev 
1059)
+++ GNUnet/src/applications/fs/fsui/check.conf  2005-06-26 13:38:03 UTC (rev 
1060)
@@ -5,7 +5,7 @@
 GNUNETD_HOME     = /tmp/gnunet-check-fsui
 # VALGRIND        = 300
 HELOEXPIRES     = 60
-LOGLEVEL        = DEBUG
+LOGLEVEL        = NOTHING
 LOGFILE         = $GNUNETD_HOME/logs
 KEEPLOG         = 0
 PIDFILE         = $GNUNETD_HOME/gnunetd.pid

Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c      2005-06-26 13:00:16 UTC 
(rev 1059)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c      2005-06-26 13:38:03 UTC 
(rev 1060)
@@ -81,12 +81,18 @@
   case FSUI_search_result:
     printf("Received search result\n");
     break;
+  case FSUI_upload_progress:
+    printf("Upload is progressing...\n");
+    break;
   case FSUI_upload_complete:
     printf("Upload complete.\n");
     break;
   case FSUI_download_complete:
     printf("Download complete.\n");
     break;
+  case FSUI_download_progress:
+    printf("Download is progressing...\n");
+    break;
   case FSUI_unindex_complete:
     printf("Unindex complete.\n");
     break;
@@ -115,7 +121,6 @@
 
 int main(int argc, char * argv[]){
   pid_t daemon;
-  int status;
   int ok;
   struct ECRS_URI * uri;
   char * fn = NULL;

Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c  2005-06-26 13:00:16 UTC (rev 
1059)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c  2005-06-26 13:38:03 UTC (rev 
1060)
@@ -40,7 +40,7 @@
                                     NULL));
   FREENONNULL(setConfigurationString("GNUNET",
                                     "LOGLEVEL",
-                                    "WARNING"));
+                                    "NOTHING"));
   FREENONNULL(setConfigurationString("GNUNET",
                                     "GNUNETD-CONFIG",
                                     "check.conf"));
@@ -105,7 +105,6 @@
 
 int main(int argc, char * argv[]){
   pid_t daemon;
-  int status;
   int ok;
   struct ECRS_URI * uri;
   char * filename = NULL; 

Modified: GNUnet/src/applications/fs/fsui/fsuitest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest2.c 2005-06-26 13:00:16 UTC (rev 
1059)
+++ GNUnet/src/applications/fs/fsui/fsuitest2.c 2005-06-26 13:38:03 UTC (rev 
1060)
@@ -56,7 +56,6 @@
 
 int main(int argc, char * argv[]){
   pid_t daemon;
-  int status;
   int ok;
 
   if (OK != initUtil(argc,

Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c        2005-06-26 13:00:16 UTC 
(rev 1059)
+++ GNUnet/src/applications/fs/fsui/searchtest.c        2005-06-26 13:38:03 UTC 
(rev 1060)
@@ -105,7 +105,6 @@
 
 int main(int argc, char * argv[]){
   pid_t daemon;
-  int status;
   int ok;
   struct ECRS_URI * uri = NULL;
   char * fn = NULL;