Re-enabled tests that were previously failing

realm · Jul 4, 2024 · 39c8e6e · 39c8e6e
1 parent 43ed5f8
commit 39c8e6e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/src/realm/sync/config.cpp b/src/realm/sync/config.cpp
@@ -112,6 +112,8 @@ std::ostream& operator<<(std::ostream& os, const SyncClientHookEvent& event)
             return os << "ClientResetMergeComplete";
         case SyncClientHookEvent::BootstrapBatchAboutToProcess:
             return os << "BootstrapBatchAboutToProcess";
+        case SyncClientHookEvent::UploadMessageSent:
+            return os << "UploadMessageSent";
     }
     REALM_TERMINATE("Invalid SyncClientHookEvent value");
 }

diff --git a/test/object-store/sync/flx_role_change.cpp b/test/object-store/sync/flx_role_change.cpp
@@ -1093,26 +1093,22 @@ TEST_CASE("flx: role changes during client resets complete successfully",
             logger->debug("ROLE CHANGE: Role change after client reset session integrating");
             set_expected_role_state(ClientResetTestState::cr_session_integrating);
         }
-        /// TODO: These tests are disabled since the role change boostraps are not working when
-        ///       the original session restarts to merge the fresh realm with the local realm.
-        ///       Uncomment these tests once https://github.com/realm/realm-core/issues/7846
-        ///       has been fixed.
-        // SECTION("Client reset session integrated") {
-        //     logger->debug("ROLE CHANGE: Role change after client reset session integrated");
-        //     set_expected_role_state(ClientResetTestState::cr_session_integrated);
-        // }
-        // SECTION("BIND after client reset session") {
-        //     logger->debug("ROLE CHANGE: Role change after BIND after client reset session");
-        //     set_expected_role_state(ClientResetTestState::bind_after_cr_session, true);
-        // }
-        // SECTION("Merged after client reset session") {
-        //     logger->debug("ROLE CHANGE: Role change after merge after client reset session");
-        //     set_expected_role_state(ClientResetTestState::merged_after_cr_session, true);
-        // }
-        // SECTION("Merged after client reset session") {
-        //     logger->debug("ROLE CHANGE: Role change after IDENT after client reset session");
-        //     set_expected_role_state(ClientResetTestState::ident_after_cr_session);
-        // }
+        SECTION("Client reset session integrated") {
+            logger->debug("ROLE CHANGE: Role change after client reset session integrated");
+            set_expected_role_state(ClientResetTestState::cr_session_integrated);
+        }
+        SECTION("BIND after client reset session") {
+            logger->debug("ROLE CHANGE: Role change after BIND after client reset session");
+            set_expected_role_state(ClientResetTestState::bind_after_cr_session, true);
+        }
+        SECTION("Merged after client reset session") {
+            logger->debug("ROLE CHANGE: Role change after merge after client reset session");
+            set_expected_role_state(ClientResetTestState::merged_after_cr_session, true);
+        }
+        SECTION("Merged after client reset session") {
+            logger->debug("ROLE CHANGE: Role change after IDENT after client reset session");
+            set_expected_role_state(ClientResetTestState::ident_after_cr_session);
+        }
 
         // Client reset will happen when session tries to reconnect
         realm_1->sync_session()->restart_session();