[GNUnet-SVN] r8957 - in gnunet/src: core datastore peerinfo transport util

[gnunet]

Author: grothoff
Date: 2009-09-07 06:04:15 -0600 (Mon, 07 Sep 2009)
New Revision: 8957

Modified:
   gnunet/src/core/test_core_api.c
   gnunet/src/datastore/test_datastore_api.c
   gnunet/src/peerinfo/test_peerinfo_api.c
   gnunet/src/transport/test_plugin_transport.c
   gnunet/src/transport/test_plugin_transport_data.conf
   gnunet/src/transport/test_transport_api.c
   gnunet/src/util/test_pseudonym.c
Log:
better clean up

Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c     2009-09-07 11:58:04 UTC (rev 8956)
+++ gnunet/src/core/test_core_api.c     2009-09-07 12:04:15 UTC (rev 8957)
@@ -384,6 +384,8 @@
 #endif
                     NULL);
   ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-core-peer-1"); 
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-core-peer-2");
 
   return ret;
 }

Modified: gnunet/src/datastore/test_datastore_api.c
===================================================================
--- gnunet/src/datastore/test_datastore_api.c   2009-09-07 11:58:04 UTC (rev 
8956)
+++ gnunet/src/datastore/test_datastore_api.c   2009-09-07 12:04:15 UTC (rev 
8957)
@@ -598,6 +598,7 @@
 #endif
                     NULL);
   ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-datastore");
 
   return ret;
 }

Modified: gnunet/src/peerinfo/test_peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/test_peerinfo_api.c     2009-09-07 11:58:04 UTC (rev 
8956)
+++ gnunet/src/peerinfo/test_peerinfo_api.c     2009-09-07 12:04:15 UTC (rev 
8957)
@@ -169,7 +169,7 @@
   int ret = 0;
 
   ret = check ();
-
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-peerinfo");
   return ret;
 }
 

Modified: gnunet/src/transport/test_plugin_transport.c
===================================================================
--- gnunet/src/transport/test_plugin_transport.c        2009-09-07 11:58:04 UTC 
(rev 8956)
+++ gnunet/src/transport/test_plugin_transport.c        2009-09-07 12:04:15 UTC 
(rev 8957)
@@ -341,6 +341,7 @@
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
+  int ret;
   char *const argv_prog[] = {
     "test_plugin_transport",
     "-c",
@@ -361,13 +362,15 @@
 #endif
                     NULL);       
   ok = 1; /* set to fail */
-  return (GNUNET_OK ==
+  ret = (GNUNET_OK ==
           GNUNET_PROGRAM_run (5,
                               argv_prog,
                               "test-plugin-transport",
                              "testcase",
                              options,
                               &run, NULL)) ? ok : 1;
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
+  return ret;
 }
 
 /* end of test_plugin_transport.c */

Modified: gnunet/src/transport/test_plugin_transport_data.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data.conf        2009-09-07 
11:58:04 UTC (rev 8956)
+++ gnunet/src/transport/test_plugin_transport_data.conf        2009-09-07 
12:04:15 UTC (rev 8957)
@@ -1,5 +1,5 @@
 [PATHS]
-SERVICEHOME = /tmp/test-plugin-transport/
+SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
 
 [resolver]
 PORT = 2364

Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2009-09-07 11:58:04 UTC (rev 
8956)
+++ gnunet/src/transport/test_transport_api.c   2009-09-07 12:04:15 UTC (rev 
8957)
@@ -294,7 +294,8 @@
 #endif
                     NULL);
   ret = check ();
-
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1"); 
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
   return ret;
 }
 

Modified: gnunet/src/util/test_pseudonym.c
===================================================================
--- gnunet/src/util/test_pseudonym.c    2009-09-07 11:58:04 UTC (rev 8956)
+++ gnunet/src/util/test_pseudonym.c    2009-09-07 12:04:15 UTC (rev 8957)
@@ -132,6 +132,7 @@
   GNUNET_PSEUDONYM_discovery_callback_unregister (&noti_callback, &notiCount);
   GNUNET_CONTAINER_meta_data_destroy (meta);
   GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test");
   return (ok == GNUNET_YES) ? 0 : 1;
 }