Merge branch 'gz-transport12' into srmainwaring/12/node-abstract-request

Author: caguero

include/gz/transport/Discovery.hh

@@ -732,16 +732,15 @@ namespace gz
           std::lock_guard<std::mutex> lock(this->mutex);
           if (!this->initialized)
           {
-            ++this->numHeartbeatsUninitialized;
-            if (this->numHeartbeatsUninitialized == 2)
+            if (this->numHeartbeatsUninitialized == 2u)
             {
-              // We consider the discovery initialized after two cycles of
-              // heartbeats sent.
+              // We consider discovery initialized after two heartbeat cycles.
               this->initialized = true;
 
               // Notify anyone waiting for the initialization phase to finish.
               this->initializedCv.notify_all();
             }
+            ++this->numHeartbeatsUninitialized;
           }
 
           this->timeNextHeartbeat = std::chrono::steady_clock::now() +

log/test/integration/CMakeLists.txt

@@ -72,12 +72,15 @@ if (HAVE_GZ_TOOLS)
     ruby ${CMAKE_CURRENT_SOURCE_DIR}/gz_log_record_no_overwrite.rb
   )
 
-  add_test(gz_log_record_force
-    ruby ${CMAKE_CURRENT_SOURCE_DIR}/gz_log_record_force.rb
-  )
+  # Test disabled
+  # add_test(gz_log_record_force
+  #   ruby ${CMAKE_CURRENT_SOURCE_DIR}/gz_log_record_force.rb
+  # )
+
   set_tests_properties(
     gz_log_record_no_overwrite
-    gz_log_record_force
+    # Test disabled
+    # gz_log_record_force
     PROPERTIES
     ENVIRONMENT
       "GZ_CONFIG_PATH=${GZ_CONFIG_PATH};GZ_TRANSPORT_LOG_SQL_PATH=${PROJECT_SOURCE_DIR}/log/sql"