Additional cleanup (removed AI comments, consolidated token IDs)

Author: alan-george-lk

.github/workflows/tests.yml

@@ -176,9 +176,6 @@ jobs:
             --gtest_output="xml:build-release\unit-test-results.xml"
 
       # ---------- Install + start livekit-server for integration tests ----------
-      # E2E (livekit-server-backed) tests run on Linux + macOS only, mirroring
-      # the Rust SDK's tests.yml which gates these steps with `matrix.e2e-testing`.
-      # Windows skips them entirely; build + unit tests still run on every platform.
       - name: Install livekit-server and lk CLI
         if: matrix.e2e-testing
         shell: bash

.token_helpers/README.md

@@ -7,5 +7,5 @@ Generate tokens and then set them as env vars for the current terminal session
 ## set_data_track_test_tokens.bash
 Generate the two participant tokens required by the C++ SDK's integration
 and stress test suites (data tracks, RPC, media multistream, etc.) and
-export them as `LK_TOKEN_TEST_A`, `LK_TOKEN_TEST_B`, and `LIVEKIT_URL` for
+export them as `LIVEKIT_TOKEN_A`, `LIVEKIT_TOKEN_B`, and `LIVEKIT_URL` for
 the current terminal session.

.token_helpers/set_data_track_test_tokens.bash

@@ -21,8 +21,8 @@
 #   eval "$(bash .token_helpers/set_data_track_test_tokens.bash)"
 #
 # Exports:
-#   LK_TOKEN_TEST_A
-#   LK_TOKEN_TEST_B
+#   LIVEKIT_TOKEN_A
+#   LIVEKIT_TOKEN_B
 #   LIVEKIT_URL=ws://localhost:7880
 #
 
@@ -103,24 +103,24 @@ _create_token() {
   printf '%s' "$token"
 }
 
-LK_TOKEN_TEST_A="$(_create_token "$LIVEKIT_IDENTITY_A")"
-LK_TOKEN_TEST_B="$(_create_token "$LIVEKIT_IDENTITY_B")"
+LIVEKIT_TOKEN_A="$(_create_token "$LIVEKIT_IDENTITY_A")"
+LIVEKIT_TOKEN_B="$(_create_token "$LIVEKIT_IDENTITY_B")"
 
 _apply() {
-  export LK_TOKEN_TEST_A
-  export LK_TOKEN_TEST_B
+  export LIVEKIT_TOKEN_A
+  export LIVEKIT_TOKEN_B
   export LIVEKIT_URL
 }
 
 _emit_eval() {
-  printf 'export LK_TOKEN_TEST_A=%q\n' "$LK_TOKEN_TEST_A"
-  printf 'export LK_TOKEN_TEST_B=%q\n' "$LK_TOKEN_TEST_B"
+  printf 'export LIVEKIT_TOKEN_A=%q\n' "$LIVEKIT_TOKEN_A"
+  printf 'export LIVEKIT_TOKEN_B=%q\n' "$LIVEKIT_TOKEN_B"
   printf 'export LIVEKIT_URL=%q\n' "$LIVEKIT_URL"
 }
 
 if [[ "$_sourced" -eq 1 ]]; then
   _apply
-  echo "LK_TOKEN_TEST_A, LK_TOKEN_TEST_B, and LIVEKIT_URL set for this shell." >&2
+  echo "LIVEKIT_TOKEN_A, LIVEKIT_TOKEN_B, and LIVEKIT_URL set for this shell." >&2
 else
   _emit_eval
   echo "set_data_track_test_tokens.bash: for this shell run: source $0   or: eval \"\$(bash $0 ...)\"" >&2

README.md

@@ -429,8 +429,8 @@ etc.) require a LiveKit server and two participant tokens:
 ```bash
 # Required
 export LIVEKIT_URL="ws://localhost:7880"            # or wss://your-server.livekit.cloud
-export LK_TOKEN_TEST_A="<first participant token>"
-export LK_TOKEN_TEST_B="<second participant token>"
+export LIVEKIT_TOKEN_A="<first participant token>"
+export LIVEKIT_TOKEN_B="<second participant token>"
 
 # Optional (for stress tests)
 export RPC_STRESS_DURATION_SECONDS=3600   # Test duration (default: 1 hour)
@@ -441,7 +441,7 @@ export RPC_STRESS_CALLER_THREADS=4        # Concurrent caller threads (default:
 
 The easiest path is to source the helper script, which will mint both
 participant tokens against a local `livekit-server --dev` and export
-`LK_TOKEN_TEST_A`, `LK_TOKEN_TEST_B`, and `LIVEKIT_URL` for the current shell:
+`LIVEKIT_TOKEN_A`, `LIVEKIT_TOKEN_B`, and `LIVEKIT_URL` for the current shell:
 
 ```bash
 source .token_helpers/set_data_track_test_tokens.bash

src/tests/common/test_common.h

@@ -70,8 +70,8 @@ constexpr char kLocalTestLiveKitUrl[] = "ws://localhost:7880";
  *
  * Environment variables:
  *   LIVEKIT_URL           - WebSocket URL of the LiveKit server
- *   LK_TOKEN_TEST_A       - Token for the first test participant
- *   LK_TOKEN_TEST_B       - Token for the second test participant
+ *   LIVEKIT_TOKEN_A       - Token for the first test participant
+ *   LIVEKIT_TOKEN_B       - Token for the second test participant
  *   TEST_ITERATIONS       - Number of iterations for iterative tests (default:
  * 10) STRESS_DURATION_SECONDS - Duration for stress tests in seconds (default:
  * 600) STRESS_CALLER_THREADS - Number of caller threads for stress tests
@@ -89,8 +89,8 @@ struct TestConfig {
   static TestConfig fromEnv() {
     TestConfig config;
     const char *url = std::getenv("LIVEKIT_URL");
-    const char *token_a = std::getenv("LK_TOKEN_TEST_A");
-    const char *token_b = std::getenv("LK_TOKEN_TEST_B");
+    const char *token_a = std::getenv("LIVEKIT_TOKEN_A");
+    const char *token_b = std::getenv("LIVEKIT_TOKEN_B");
     const char *iterations_env = std::getenv("TEST_ITERATIONS");
     const char *duration_env = std::getenv("STRESS_DURATION_SECONDS");
     const char *threads_env = std::getenv("STRESS_CALLER_THREADS");
@@ -142,17 +142,17 @@ inline bool waitForParticipant(Room *room, const std::string &identity,
 }
 
 inline std::array<std::string, 2> getDataTrackTestTokens() {
-  const char *token_a = std::getenv("LK_TOKEN_TEST_A");
+  const char *token_a = std::getenv("LIVEKIT_TOKEN_A");
   if (token_a == nullptr || std::string(token_a).empty()) {
     throw std::runtime_error(
-        "LK_TOKEN_TEST_A must be present and non-empty for data track E2E "
+        "LIVEKIT_TOKEN_A must be present and non-empty for data track E2E "
         "tests");
   }
 
-  const char *token_b = std::getenv("LK_TOKEN_TEST_B");
+  const char *token_b = std::getenv("LIVEKIT_TOKEN_B");
   if (token_b == nullptr || std::string(token_b).empty()) {
     throw std::runtime_error(
-        "LK_TOKEN_TEST_B must be present and non-empty for data track E2E "
+        "LIVEKIT_TOKEN_B must be present and non-empty for data track E2E "
         "tests");
   }
 
@@ -216,7 +216,7 @@ testRooms(const std::vector<TestRoomConnectionOptions> &room_configs) {
 
   if (room_configs.size() > 2) {
     throw std::invalid_argument(
-        "testRooms supports at most two rooms with LK_TOKEN_TEST_A/B");
+        "testRooms supports at most two rooms with LIVEKIT_TOKEN_A/LIVEKIT_TOKEN_B");
   }
 
   auto tokens = getDataTrackTestTokens();
@@ -516,7 +516,7 @@ class LiveKitTestBase : public ::testing::Test {
   void skipIfNotConfigured() {
     if (!config_.available) {
       GTEST_SKIP()
-          << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+          << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
     }
   }
 

src/tests/integration/test_media_multistream.cpp

@@ -87,7 +87,7 @@ void MediaMultiStreamIntegrationTest::runPublishTwoVideoAndTwoAudioTracks(
     bool single_peer_connection) {
   if (!config_.available) {
     GTEST_SKIP()
-        << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+        << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
   }
 
   RoomOptions options;

src/tests/integration/test_room.cpp

@@ -98,14 +98,14 @@ TEST_F(RoomTest, RemoteParticipantLookupBeforeConnect) {
       << "Looking up participant before connect should return nullptr";
 }
 
-// Server-dependent tests - require LIVEKIT_URL and LK_TOKEN_TEST_A env vars
+// Server-dependent tests - require LIVEKIT_URL and LIVEKIT_TOKEN_A env vars
 class RoomServerTest : public ::testing::Test {
 protected:
   void SetUp() override {
     livekit::initialize(livekit::LogLevel::Info, livekit::LogSink::kConsole);
 
     const char *url_env = std::getenv("LIVEKIT_URL");
-    const char *token_env = std::getenv("LK_TOKEN_TEST_A");
+    const char *token_env = std::getenv("LIVEKIT_TOKEN_A");
 
     if (url_env && token_env) {
       server_url_ = url_env;
@@ -123,7 +123,7 @@ class RoomServerTest : public ::testing::Test {
 
 TEST_F(RoomServerTest, ConnectToServer) {
   if (!server_available_) {
-    GTEST_SKIP() << "LIVEKIT_URL and LK_TOKEN_TEST_A not set, skipping server "
+    GTEST_SKIP() << "LIVEKIT_URL and LIVEKIT_TOKEN_A not set, skipping server "
                     "connection test";
   }
 

src/tests/integration/test_rpc.cpp

@@ -43,8 +43,8 @@ struct RpcTestConfig {
   static RpcTestConfig fromEnv() {
     RpcTestConfig config;
     const char *url = std::getenv("LIVEKIT_URL");
-    const char *token_a = std::getenv("LK_TOKEN_TEST_A");
-    const char *token_b = std::getenv("LK_TOKEN_TEST_B");
+    const char *token_a = std::getenv("LIVEKIT_TOKEN_A");
+    const char *token_b = std::getenv("LIVEKIT_TOKEN_B");
 
     if (url && token_a && token_b) {
       config.url = url;
@@ -118,7 +118,7 @@ class RpcIntegrationTest : public ::testing::Test {
 TEST_F(RpcIntegrationTest, BasicRpcRoundTrip) {
   if (!config_.available) {
     GTEST_SKIP()
-        << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+        << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
   }
 
   // Create receiver room
@@ -188,7 +188,7 @@ TEST_F(RpcIntegrationTest, BasicRpcRoundTrip) {
 TEST_F(RpcIntegrationTest, MaxPayloadSize) {
   if (!config_.available) {
     GTEST_SKIP()
-        << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+        << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
   }
 
   auto receiver_room = std::make_unique<Room>();
@@ -233,7 +233,7 @@ TEST_F(RpcIntegrationTest, MaxPayloadSize) {
 TEST_F(RpcIntegrationTest, RpcTimeout) {
   if (!config_.available) {
     GTEST_SKIP()
-        << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+        << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
   }
 
   auto receiver_room = std::make_unique<Room>();
@@ -280,7 +280,7 @@ TEST_F(RpcIntegrationTest, RpcTimeout) {
 TEST_F(RpcIntegrationTest, UnsupportedMethod) {
   if (!config_.available) {
     GTEST_SKIP()
-        << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+        << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
   }
 
   auto receiver_room = std::make_unique<Room>();
@@ -320,7 +320,7 @@ TEST_F(RpcIntegrationTest, UnsupportedMethod) {
 TEST_F(RpcIntegrationTest, ApplicationError) {
   if (!config_.available) {
     GTEST_SKIP()
-        << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+        << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
   }
 
   auto receiver_room = std::make_unique<Room>();
@@ -367,7 +367,7 @@ TEST_F(RpcIntegrationTest, ApplicationError) {
 TEST_F(RpcIntegrationTest, ConcurrentRpcCalls) {
   if (!config_.available) {
     GTEST_SKIP()
-        << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+        << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
   }
 
   auto receiver_room = std::make_unique<Room>();
@@ -435,7 +435,7 @@ TEST_F(RpcIntegrationTest, ConcurrentRpcCalls) {
 TEST_F(RpcIntegrationTest, OneMinuteIntegration) {
   if (!config_.available) {
     GTEST_SKIP()
-        << "LIVEKIT_URL, LK_TOKEN_TEST_A, and LK_TOKEN_TEST_B not set";
+        << "LIVEKIT_URL, LIVEKIT_TOKEN_A, and LIVEKIT_TOKEN_B not set";
   }
 
   auto receiver_room = std::make_unique<Room>();

src/tests/stress/test_room_stress.cpp

@@ -192,7 +192,7 @@ class RoomServerStressTest : public ::testing::Test {
     livekit::initialize(livekit::LogLevel::Info, livekit::LogSink::kConsole);
 
     const char *url_env = std::getenv("LIVEKIT_URL");
-    const char *token_env = std::getenv("LK_TOKEN_TEST_A");
+    const char *token_env = std::getenv("LIVEKIT_TOKEN_A");
 
     if (url_env && token_env) {
       server_url_ = url_env;
@@ -210,7 +210,7 @@ class RoomServerStressTest : public ::testing::Test {
 
 TEST_F(RoomServerStressTest, RepeatedConnectDisconnect) {
   if (!server_available_) {
-    GTEST_SKIP() << "LIVEKIT_URL and LK_TOKEN_TEST_A not set, skipping server "
+    GTEST_SKIP() << "LIVEKIT_URL and LIVEKIT_TOKEN_A not set, skipping server "
                     "stress test";
   }