[GNUnet-SVN] r11981 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2010-06-27 16:26:17 +0200 (Sun, 27 Jun 2010)
New Revision: 11981

Modified:
   gnunet/src/testing/test_testing_group_remote.c
   gnunet/src/testing/test_testing_topology_blacklist.c
Log:
coverity and codesonar fixes

Modified: gnunet/src/testing/test_testing_group_remote.c
===================================================================
--- gnunet/src/testing/test_testing_group_remote.c      2010-06-27 14:25:45 UTC 
(rev 11980)
+++ gnunet/src/testing/test_testing_group_remote.c      2010-06-27 14:26:17 UTC 
(rev 11981)
@@ -93,9 +93,13 @@
                                              &num_peers))
     num_peers = DEFAULT_NUM_PEERS;
 
-  GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "hosts",
-                                         &hostnames);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg, "testing", 
"hosts",
+                                         &hostnames))
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "No hosts specified, running all tests 
on localhost\n");
+  }
 
+
   peers_left = num_peers;
   pg = GNUNET_TESTING_daemons_start (sched,
                                      cfg,

Modified: gnunet/src/testing/test_testing_topology_blacklist.c
===================================================================
--- gnunet/src/testing/test_testing_topology_blacklist.c        2010-06-27 
14:25:45 UTC (rev 11980)
+++ gnunet/src/testing/test_testing_topology_blacklist.c        2010-06-27 
14:26:17 UTC (rev 11981)
@@ -377,6 +377,10 @@
   if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string(cfg, "paths", 
"servicehome", &test_directory))
     {
       ok = 404;
+      if (dotOutFile != NULL)
+        {
+          fclose(dotOutFile);
+        }
       return;
     }
 
@@ -407,11 +411,27 @@
         "connect_topology_option_modifier",
         "TESTING");
         GNUNET_free (connect_topology_option_modifier_string);
+        ok = 707;
+        if (dotOutFile != NULL)
+          {
+            fclose(dotOutFile);
+          }
+        return;
       }
+      GNUNET_free (connect_topology_option_modifier_string);
     }
 
-  GNUNET_CONFIGURATION_get_value_string (cfg, "testing", 
"blacklist_transports",
-                                         &blacklist_transports);
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "testing", 
"blacklist_transports",
+                                         &blacklist_transports))
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "No transports specified for 
blacklisting in blacklist testcase (this shouldn't happen!)\n");
+    ok = 808;
+    if (dotOutFile != NULL)
+      {
+        fclose(dotOutFile);
+      }
+    return;
+  }
 
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_number (cfg, "testing", 
"blacklist_topology",