From 011665e10d2b84ae44ad425694e4d90b44febc06 Mon Sep 17 00:00:00 2001
From: shijing xian <shijing.xian@livekit.io>
Date: Mon, 13 Apr 2026 17:54:38 -0700
Subject: [PATCH] fix the RPC tests

---
 .../integration/test_media_multistream.cpp    | 10 +++++++--
 src/tests/stress/test_latency_measurement.cpp | 21 ++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/tests/integration/test_media_multistream.cpp b/src/tests/integration/test_media_multistream.cpp
index 8b98fe98..819365d7 100644
--- a/src/tests/integration/test_media_multistream.cpp
+++ b/src/tests/integration/test_media_multistream.cpp
@@ -231,10 +231,16 @@ void MediaMultiStreamIntegrationTest::runPublishTwoVideoAndTwoAudioTracks(
   }
 
   for (const auto &track : video_tracks) {
-    sender_room->localParticipant()->unpublishTrack(track->sid());
+    if (track->publication()) {
+      sender_room->localParticipant()->unpublishTrack(
+          track->publication()->sid());
+    }
   }
   for (const auto &track : audio_tracks) {
-    sender_room->localParticipant()->unpublishTrack(track->sid());
+    if (track->publication()) {
+      sender_room->localParticipant()->unpublishTrack(
+          track->publication()->sid());
+    }
   }
 }
 
diff --git a/src/tests/stress/test_latency_measurement.cpp b/src/tests/stress/test_latency_measurement.cpp
index e93d2102..24e3cbf5 100644
--- a/src/tests/stress/test_latency_measurement.cpp
+++ b/src/tests/stress/test_latency_measurement.cpp
@@ -294,8 +294,19 @@ TEST_F(LatencyMeasurementTest, ConnectionTime) {
       double latency_ms =
           std::chrono::duration<double, std::milli>(end - start).count();
       stats.addMeasurement(latency_ms);
+
+      // Get room and participant session IDs for debugging
+      auto room_info = room->room_info();
+      std::string room_sid =
+          room_info.sid.has_value() ? room_info.sid.value() : "unknown";
+      std::string participant_sid = room->localParticipant()
+                                        ? room->localParticipant()->sid()
+                                        : "unknown";
+
       std::cout << "  Iteration " << (i + 1) << ": " << std::fixed
-                << std::setprecision(2) << latency_ms << " ms" << std::endl;
+                << std::setprecision(2) << latency_ms << " ms"
+                << " | participant_sid=" << participant_sid
+                << " | room_sid=" << room_sid << std::endl;
 
     } else {
       std::cout << "  Iteration " << (i + 1) << ": FAILED to connect"
@@ -841,8 +852,12 @@ TEST_F(LatencyMeasurementTest, FullDeplexAudioLatency) {
     std::cout << "Response timeouts: " << timeouts << std::endl;
   }
 
-  room_a->localParticipant()->unpublishTrack(track_a->sid());
-  room_b->localParticipant()->unpublishTrack(track_b->sid());
+  if (track_a->publication()) {
+    room_a->localParticipant()->unpublishTrack(track_a->publication()->sid());
+  }
+  if (track_b->publication()) {
+    room_b->localParticipant()->unpublishTrack(track_b->publication()->sid());
+  }
 
   EXPECT_GT(round_trip_stats.count(), 0)
       << "At least one round-trip latency measurement should be recorded";