[GNUnet-SVN] [gnunet] branch master updated (3f52ce03c -> d07dddc7d)

[gnunet]

This is an automated email from the git hooks/post-receive script.

julius-buenger pushed a change to branch master
in repository gnunet.

    from 3f52ce03c Merge branch 'master' of git+ssh://gnunet.org/gnunet
     new 0c0117724 rps tests: remove assertion
     new d07dddc7d rps tests: possibly end non-churn-tests before timeout

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/rps/test_rps.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index 2cc1ac62e..4d6f1bfd1 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -801,8 +801,9 @@ default_reply_handle (void *cls,
     rps_peer->num_recv_ids++;
   }
 
-  if (0 == evaluate ())
+  if (0 == evaluate () && 0 != strncmp (cur_test_run.name, "test-rps-churn", 
14))
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test succeeded before timeout\n");
     GNUNET_assert (NULL != shutdown_task);
     GNUNET_SCHEDULER_cancel (shutdown_task);
     shutdown_task = GNUNET_SCHEDULER_add_now (&shutdown_op, NULL);
@@ -1265,8 +1266,6 @@ manage_service_wrapper (unsigned int i, unsigned int j,
   struct OpListEntry *entry;
   uint32_t prob;
 
-  GNUNET_assert (GNUNET_YES == rps_peers[j].online);
-
   /* make sure that management operation is not already scheduled */
   if (NULL != rps_peers[j].entry_op_manage)
   {
@@ -1288,10 +1287,6 @@ manage_service_wrapper (unsigned int i, unsigned int j,
                 GNUNET_i2s (rps_peers[j].peer_id),
                 (PEER_GO_OFFLINE == delta) ? "offline" : "online");
 
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "testbed_peers points to %p, peer 0 to %p\n",
-                testbed_peers, testbed_peers[0]);
-
     if (PEER_GO_OFFLINE == delta)
       cancel_pending_req_rep (&rps_peers[j]);
     entry = make_oplist_entry ();

-- 
To stop receiving notification emails like this one, please contact
address@hidden