Send rejoin packets on conference disconnection

We were mistakenly not making a rejoin attempt on freezing connections
due to all closest connections going down. This fixes that, and tweaks
the test. I've still only done tens rather than hundreds of tests, but
I'm fairly confident that the conference test now consistently passes.

1 files changed, 31 insertions, 11 deletions

diff --git a/auto_tests/conference_test.c b/auto_tests/conference_test.c
index fb6e7ca8..824592c6 100644
--- a/auto_tests/conference_test.c
+++ b/auto_tests/conference_test.c
@@ -129,6 +129,22 @@ static bool all_connected_to_group(uint32_t tox_count, Tox **toxes)
     return true;
 }
 
+static bool names_propagated(uint32_t tox_count, Tox **toxes, State *state)
+{
+    for (uint16_t i = 0; i < tox_count; ++i) {
+        for (uint16_t j = 0; j < tox_count; ++j) {
+            const size_t len = tox_conference_peer_get_name_size(toxes[i], 0, j, nullptr);
+
+            if (len != NAMELEN) {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+
 /* returns a random index at which a list of booleans is false
  * (some such index is required to exist)
  * */
@@ -145,9 +161,9 @@ static uint32_t random_false_index(bool *list, const uint32_t length)
 
 static void run_conference_tests(Tox **toxes, State *state)
 {
-    /* disabling name propagation check for now, as it occasionally fails due
-     * to disconnections too short to trigger freezing */
-    const bool check_name_propagation = false;
+    /* disabling name change propagation check for now, as it occasionally
+     * fails due to disconnections too short to trigger freezing */
+    const bool check_name_change_propagation = false;
 
     printf("letting random toxes timeout\n");
     bool disconnected[NUM_GROUP_TOX] = {0};
@@ -171,7 +187,7 @@ static void run_conference_tests(Tox **toxes, State *state)
         c_sleep(20);
     } while (!toxes_are_disconnected_from_group(NUM_GROUP_TOX, toxes, NUM_DISCONNECT, disconnected));
 
-    if (check_name_propagation) {
+    if (check_name_change_propagation) {
         printf("changing names\n");
 
         for (uint16_t i = 0; i < NUM_GROUP_TOX; ++i) {
@@ -191,6 +207,8 @@ static void run_conference_tests(Tox **toxes, State *state)
 
     for (uint16_t i = 0; i < NUM_GROUP_TOX; ++i) {
         tox_callback_conference_message(toxes[i], &handle_conference_message);
+
+        iterate_all_wait(NUM_GROUP_TOX, toxes, state, ITERATION_INTERVAL);
     }
 
     TOX_ERR_CONFERENCE_SEND_MESSAGE err;
@@ -208,13 +226,9 @@ static void run_conference_tests(Tox **toxes, State *state)
 
     ck_assert_msg(num_recv == NUM_GROUP_TOX, "failed to recv group messages");
 
-    for (uint16_t i = 0; i < NUM_GROUP_TOX; ++i) {
-        for (uint16_t j = 0; j < NUM_GROUP_TOX; ++j) {
-            const size_t len = tox_conference_peer_get_name_size(toxes[i], 0, j, nullptr);
-            ck_assert_msg(len == NAMELEN, "name of #%u according to #%u has incorrect length %u", state[j].index, state[i].index,
-                          (unsigned int)len);
-
-            if (check_name_propagation) {
+    if (check_name_change_propagation) {
+        for (uint16_t i = 0; i < NUM_GROUP_TOX; ++i) {
+            for (uint16_t j = 0; j < NUM_GROUP_TOX; ++j) {
                 uint8_t name[NAMELEN];
                 tox_conference_peer_get_name(toxes[i], 0, j, name, nullptr);
                 /* Note the toxes will have been reordered */
@@ -321,6 +335,12 @@ static void test_many_group(Tox **toxes, State *state)
         ck_assert_msg(memcmp("Gentoo", title, ret) == 0, "Wrong title");
     }
 
+    printf("waiting for names to propagate\n");
+
+    do {
+        iterate_all_wait(NUM_GROUP_TOX, toxes, state, ITERATION_INTERVAL);
+    } while (!names_propagated(NUM_GROUP_TOX, toxes, state));
+
     printf("group connected, took %d seconds\n", (int)((state[0].clock - pregroup_clock) / 1000));
 
     run_conference_tests(toxes, state);