-do not leave PPT timeout tasks behind

[oweals/gnunet.git] / src / transport / test_transport_address_switch.c

diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c
index bf36c5beaef808ed677281d07b793f175331ad85..52d8c441fb04323785da37c2f61bee48b340c09f 100644 (file)
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -14,8 +14,8 @@
 
  You should have received a copy of the GNU General Public License
  along with GNUnet; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
  */
 /**
  * @file transport/test_transport_address_switch.c
@@ -325,7 +325,6 @@ clean_up ()
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
     p2 = NULL;
   }
-
 }
 
 
@@ -368,7 +367,7 @@ end ()
     if (p2_switch_success != p2_switch_attempts)
     {
       GNUNET_break (0);
-      result ++;
+      result++;
     }
   }
   else if (p2_addresses_avail > 1)
@@ -383,14 +382,14 @@ end ()
   {
     FPRINTF (stderr, "No data sent after switching!\n");
     GNUNET_break (0);
-    res ++;
+    res++;
   }
   if ( ((p1_switch_attempts > 0) || (p2_switch_attempts > 0)) &&
        (bytes_recv_after_switch == 0) )
   {
     FPRINTF (stderr, "No data received after switching!\n");
     GNUNET_break (0);
-    res ++;
+    res++;
   }
 
   clean_up();
@@ -403,16 +402,25 @@ static void
 end_badly ()
 {
   die_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Fail (timeout)! Stopping peers\n");
+  clean_up();
+  if (0 == p1_switch_attempts + p2_switch_attempts)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Test did not work, as peers didn't switch (flawed testcase)!\n");
+    res = 0;
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Fail (timeout)! No transmission after switch! Stopping peers\n");
+    res = GNUNET_YES;
+  }
   if (test_connected == GNUNET_YES)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Peers got connected\n");
   else
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Peers got NOT EVEN connected\n");
-  clean_up();
-  res = GNUNET_YES;
 }