[tests] Prevent socket from being closed twice in EE test (#2886).

Haivision · Feb 21, 2024 · 6b75145 · 6b75145
1 parent 07e22ca
commit 6b75145
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/test/test_enforced_encryption.cpp b/test/test_enforced_encryption.cpp
@@ -257,8 +257,16 @@ class TestEnforcedEncryption
     {
         // Code here will be called just after the test completes.
         // OK to throw exceptions from here if needed.
-        EXPECT_NE(srt_close(m_caller_socket),   SRT_ERROR) << srt_getlasterror_str();
-        EXPECT_NE(srt_close(m_listener_socket), SRT_ERROR) << srt_getlasterror_str();
+
+        if (m_caller_socket != SRT_INVALID_SOCK)
+        {
+            EXPECT_NE(srt_close(m_caller_socket),   SRT_ERROR) << srt_getlasterror_str();
+        }
+
+        if (m_listener_socket != SRT_INVALID_SOCK)
+        {
+            EXPECT_NE(srt_close(m_listener_socket), SRT_ERROR) << srt_getlasterror_str();
+        }
     }
 
 
@@ -541,6 +549,7 @@ class TestEnforcedEncryption
             // Just give it some time and close the socket.
             std::this_thread::sleep_for(std::chrono::milliseconds(50));
             ASSERT_NE(srt_close(m_listener_socket), SRT_ERROR);
+            m_listener_socket = SRT_INVALID_SOCK; // mark closed already
             accepting_thread.join();
         }
     }