cc tests: disable TSan-related tests in a more civilized way

commit_hash:b6365756619e2465873f447c059d078ee0c430c1

Author: Anton3

core/src/components/common_server_component_list_test.cpp

@@ -286,8 +286,11 @@ TEST_F(CommonServerComponentList, Smoke) {
     );
 }
 
-#if !USERVER_IMPL_HAS_TSAN
 TEST_F(CommonServerComponentList, Logger) {
+#if USERVER_IMPL_HAS_TSAN
+    GTEST_SKIP() << "MemLogger default logger replacement is unstable under TSan";
+#endif
+
     auto& old_logger = logging::GetDefaultLogger();
     logging::impl::SetDefaultLoggerRef(logging::impl::MemLogger::GetMemLogger());
 
@@ -321,7 +324,6 @@ TEST_F(CommonServerComponentList, Logger) {
     logging::impl::MemLogger::GetMemLogger().ForwardTo(&old_logger);
     logging::impl::MemLogger::GetMemLogger().ForwardTo(nullptr);
 }
-#endif
 
 TEST_F(CommonServerComponentList, TraceLogging) {
     fs::blocking::RewriteFileContents(

core/src/engine/single_use_event_test.cpp

@@ -172,8 +172,11 @@ UTEST_MT(SingleUseEvent, SendWaitRace, 2) {
     }
 }
 
-#if !USERVER_IMPL_HAS_TSAN
 UTEST_MT(SingleUseEvent, SendCancelRace, 3) {
+#if USERVER_IMPL_HAS_TSAN
+    GTEST_SKIP() << "The race relies on scheduler behavior that is not stable under TSan";
+#endif
+
     const auto test_deadline = engine::Deadline::FromDuration(100ms);
 
     bool is_ready_status_achieved = false;
@@ -210,7 +213,6 @@ UTEST_MT(SingleUseEvent, SendCancelRace, 3) {
         }
     }
 }
-#endif
 
 namespace {
 
@@ -262,8 +264,11 @@ UTEST_P_MT(SingleUseEventWaitAny, WaitSendRace, 2) {
     }
 }
 
-#if !USERVER_IMPL_HAS_TSAN
 UTEST_P_MT(SingleUseEventWaitAny, SendCancelRace, 3) {
+#if USERVER_IMPL_HAS_TSAN
+    GTEST_SKIP() << "The race relies on scheduler behavior that is not stable under TSan";
+#endif
+
     const auto event_to_notify = GetParam();
     const auto test_deadline = engine::Deadline::FromDuration(50ms);
 
@@ -298,6 +303,5 @@ UTEST_P_MT(SingleUseEventWaitAny, SendCancelRace, 3) {
         }
     }
 }
-#endif
 
 USERVER_NAMESPACE_END

core/src/engine/thread_local_test.cpp

@@ -91,8 +91,6 @@ UTEST_MT(ThreadLocal, DISABLED_TaskUsesCorrectInstanceAfterSleep, 2) {
     UEXPECT_NO_THROW(sleep2.Get());
 }
 
-// Test is not ready to TSan non-migrating scheduler
-#if !USERVER_IMPL_HAS_TSAN
 namespace {
 
 auto& SafeGetThreadLocal() {
@@ -111,6 +109,10 @@ void SafeMultiplyThreadLocal(int new_value) noexcept {
 // This is a copy-paste from TaskUsesCorrectInstanceAfterSleep test.
 // While the test above consistently fails as of now, this test should pass.
 UTEST_MT(ThreadLocal, SafeThreadLocalWorks, 2) {
+#if USERVER_IMPL_HAS_TSAN
+    GTEST_SKIP() << "The test is not ready for the TSan non-migrating scheduler";
+#endif
+
     const auto thread1_id = pthread_self();
 
     auto sleep2 = engine::AsyncNoTracing([&] {
@@ -160,7 +162,6 @@ UTEST_MT(ThreadLocal, SafeThreadLocalWorks, 2) {
 
     UEXPECT_NO_THROW(sleep2.Get());
 }
-#endif
 
 namespace {
 

core/src/testsuite/testpoint_test.cpp

@@ -3,6 +3,7 @@
 #include <thread>
 
 #include <userver/compiler/impl/tsan.hpp>
+#include <userver/engine/task/current_task.hpp>
 #include <userver/engine/task/task_base.hpp>
 #include <userver/formats/json/inline.hpp>
 #include <userver/formats/json/value_builder.hpp>
@@ -20,6 +21,7 @@ class EchoTestpointClient final : public testsuite::TestpointClientBase {
     ~EchoTestpointClient() override { Unregister(); }
 
     void Execute(std::string_view name, const formats::json::Value& json, Callback callback) const override {
+        EXPECT_TRUE(engine::current_task::IsTaskProcessorThread());
         callback(formats::json::MakeObject("name", name, "body", json));
     }
 };
@@ -87,23 +89,25 @@ UTEST(Testpoint, MultipleTestpointsInSameScope) {
     EXPECT_EQ(times_called, 4);
 }
 
-#if !USERVER_IMPL_HAS_TSAN
 UTEST(Testpoint, Exceptions) {
     testsuite::TestpointControl testpoint_control;
     EchoTestpointClient testpoint_client;
     testpoint_control.SetClient(testpoint_client);
     testpoint_control.SetAllEnabled();
 
-    try {
-        TESTPOINT_CALLBACK("name-throws", {}, [](const auto&) {
-            // Callbacks may throw. It is fine and used in SQL drivers of userver for
-            // error injection.
-            throw Exception();
-            return formats::json::Value{};
-        });
-        FAIL() << "Exception was swallowed";
-    } catch (const Exception&) {
-    }
+    UEXPECT_THROW(
+        TESTPOINT_CALLBACK(
+            "name-throws",
+            {},
+            [](const auto&) {
+                // Callbacks may throw. It is fine and used in SQL drivers of userver for
+                // error injection.
+                throw Exception();
+                return formats::json::Value{};
+            }
+        ),
+        Exception
+    );
 }
 
 UTEST_MT(Testpoint, ExceptionsNoncoro, 2) {
@@ -115,20 +119,23 @@ UTEST_MT(Testpoint, ExceptionsNoncoro, 2) {
     auto& tp = engine::current_task::GetTaskProcessor();
 
     std::thread([&] {
-        try {
-            TESTPOINT_CALLBACK_NONCORO("name-throws-noncoro", {}, tp, [](const auto&) {
-                // Callbacks may throw. It is fine and used
-                // in SQL drivers of userver for error
-                // injection.
-                throw Exception();
-                return formats::json::Value{};
-            });
-            FAIL() << "Exception was swallowed";
-        } catch (const Exception&) {
-        }
+        UEXPECT_THROW(
+            TESTPOINT_CALLBACK_NONCORO(
+                "name-throws-noncoro",
+                {},
+                tp,
+                [](const auto&) {
+                    // Callbacks may throw. It is fine and used
+                    // in SQL drivers of userver for error
+                    // injection.
+                    throw Exception();
+                    return formats::json::Value{};
+                }
+            ),
+            Exception
+        );
     }).join();
 }
-#endif
 
 UTEST(Testpoint, Inactive) {
     testsuite::TestpointControl testpoint_control;