Fix testcase

[oweals/gnunet.git] / src / mesh / test_mesh_path_api.c

diff --git a/src/mesh/test_mesh_path_api.c b/src/mesh/test_mesh_path_api.c
index 177250901314f190bbdf643738c332edec11640a..58bc6bd20a0eed024bdd8de293c572df92fc2ed5 100644 (file)
--- a/src/mesh/test_mesh_path_api.c
+++ b/src/mesh/test_mesh_path_api.c
@@ -101,8 +101,9 @@ main (int argc, char *argv[])
   for (i = 0; i < 10; i++)
   {
       pi[i] = get_pi(i);
-      GNUNET_break (i != GNUNET_PEER_intern(pi[i]));
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peer %u: %s\n", i,
+      GNUNET_break (i + 1 == GNUNET_PEER_intern(pi[i]));
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Peer %u: %s\n",
+                 i + 1,
                  GNUNET_h2s(&pi[i]->hashPubKey));
   }
   tree = GNUNET_malloc(sizeof(struct MeshTunnelTree));
@@ -142,6 +143,7 @@ main (int argc, char *argv[])
   if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 2)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
+    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "4 GOT: %u\n", GNUNET_PEER_search(path_get_first_hop(tree, 4)));
     failed++;
   }
 
@@ -161,9 +163,10 @@ main (int argc, char *argv[])
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
     failed++;
   }
-  if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 2)
+  if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 2)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
+    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "4 GOT: %u\n", GNUNET_PEER_search(path_get_first_hop(tree, 4)));
     failed++;
   }
 
@@ -198,6 +201,7 @@ main (int argc, char *argv[])
   if (node->status != MESH_PEER_SEARCHING)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
+    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "  expected SEARCHING, got %u\n", node->status);
     failed++;
   }
   if (node->children_head != node->children_tail)
@@ -227,6 +231,7 @@ main (int argc, char *argv[])
   if (node->status != MESH_PEER_RELAY)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong status!\n");
+    GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "  expected RELAY\n");
     failed++;
   }
   if (node->children_head != node->children_tail)
@@ -330,9 +335,9 @@ main (int argc, char *argv[])
 
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "test: Adding new shorter first path...\n");
   path->length = 2;
-  path->peers[1] = 3;
+  path->peers[1] = 4;
   cb_call = 1;
-  tree_find_peer(tree->root, 3)->status = MESH_PEER_READY;
+  tree_find_peer(tree->root, 4)->status = MESH_PEER_READY;
   tree_add_path(tree, path, cb);
   tree_debug(tree);
   if (cb_call != 0)
@@ -340,8 +345,8 @@ main (int argc, char *argv[])
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "%u callbacks missed!\n", cb_call);
     failed++;
   }  
-  node = tree_find_peer(tree->root, 2);
-  if (node->peer != 2)
+  node = tree_find_peer(tree->root, 3);
+  if (node->peer != 3)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
     failed++;
@@ -356,8 +361,8 @@ main (int argc, char *argv[])
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
     failed++;
   }
-  node = tree_find_peer(tree->root, 3);
-  if (node->peer != 3)
+  node = tree_find_peer(tree->root, 4);
+  if (node->peer != 4)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer != original\n");
     failed++;
@@ -372,12 +377,12 @@ main (int argc, char *argv[])
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Retrieved peer wrong nchildren!\n");
     failed++;
   }
-  if (GNUNET_PEER_search(path_get_first_hop(tree, 2)) != 1)
+  if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 2)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
     failed++;
   }
-  if (GNUNET_PEER_search(path_get_first_hop(tree, 3)) != 3)
+  if (GNUNET_PEER_search(path_get_first_hop(tree, 4)) != 4)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Wrong first hop!\n");
     failed++;
@@ -390,7 +395,7 @@ main (int argc, char *argv[])
     return 1;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: OK\n");
-  path_destroy(path);
+  GNUNET_free (path);
   finish();
 
   return 0;