Merge pull request #420 from gazebosim/caguero_8_11

Merge ign-transport8 ➡️ ign-transport11
gazebosim · Jul 14, 2023 · 0e76a20 · 0e76a20
2 parents 65994b2 + 87aa000
commit 0e76a20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/include/gz/transport/Discovery.hh b/include/gz/transport/Discovery.hh
@@ -716,16 +716,15 @@ namespace ignition
           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() +

diff --git a/log/test/integration/CMakeLists.txt b/log/test/integration/CMakeLists.txt
@@ -72,12 +72,15 @@ if (HAVE_IGN_TOOLS)
     ruby ${CMAKE_CURRENT_SOURCE_DIR}/ign_log_record_no_overwrite.rb
   )
 
-  add_test(ign_log_record_force
-    ruby ${CMAKE_CURRENT_SOURCE_DIR}/ign_log_record_force.rb
-  )
+  # Test disabled on Citadel
+  #add_test(ign_log_record_force
+  #  ruby ${CMAKE_CURRENT_SOURCE_DIR}/ign_log_record_force.rb
+  #)
+
   set_tests_properties(
     ign_log_record_no_overwrite
-    ign_log_record_force
+    # Test disabled on Citadel
+    # ign_log_record_force
     PROPERTIES
     ENVIRONMENT
       "IGN_CONFIG_PATH=${IGN_CONFIG_PATH};IGN_TRANSPORT_LOG_SQL_PATH=${PROJECT_SOURCE_DIR}/log/sql"