cc postgresql: collect cancel tests in single file

commit_hash:b941055cddb5e94617684e51f5be0f2dab76450f

Author: ArkadyRudenko

postgresql/src/storages/postgres/tests/cancel_pgtest.cpp

@@ -1,5 +1,6 @@
 #include <storages/postgres/tests/util_pgtest.hpp>
 #include <userver/engine/async.hpp>
+#include <userver/engine/single_consumer_event.hpp>
 #include <userver/engine/sleep.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -54,6 +55,40 @@ UTEST_P(PostgreConnection, Cancel) {
     ASSERT_NO_THROW(conn->Execute("select 1", /*query_params*/ {}, cmd_ctrl)) << "connection must be usable";
 }
 
+void CleanupConnectionTest(storages::postgres::detail::ConnectionPtr& conn, bool use_cancel) {
+    EXPECT_EQ(pg::ConnectionState::kIdle, conn->GetState());
+
+    const DefaultCommandControlScope scope(pg::CommandControl{utest::kMaxTestWaitTime, utest::kMaxTestWaitTime});
+
+    engine::SingleConsumerEvent task_started;
+    auto task = engine::AsyncNoSpan([&] {
+        task_started.Send();
+        UEXPECT_THROW(conn->Execute("select pg_sleep(1)"), pg::ConnectionInterrupted);
+    });
+    ASSERT_TRUE(task_started.WaitForEventFor(utest::kMaxTestWaitTime));
+    task.RequestCancel();
+    task.WaitFor(utest::kMaxTestWaitTime);
+    ASSERT_TRUE(task.IsFinished());
+
+    EXPECT_EQ(pg::ConnectionState::kTranActive, conn->GetState());
+    if (use_cancel) {
+        UEXPECT_NO_THROW(conn->CancelAndCleanup(utest::kMaxTestWaitTime));
+    } else {
+        UEXPECT_NO_THROW(conn->Cleanup(std::chrono::seconds{2}));
+    }
+    EXPECT_EQ(pg::ConnectionState::kIdle, conn->GetState());
+}
+
+UTEST_P(PostgreConnection, QueryTaskCancelAndCleanup) {
+    CheckConnection(GetConn());
+    CleanupConnectionTest(GetConn(), /*use cancel=*/true);
+}
+
+UTEST_P(PostgreConnection, QueryTaskCleanup) {
+    CheckConnection(GetConn());
+    CleanupConnectionTest(GetConn(), /*use cancel=*/false);
+}
+
 }  // namespace
 
 USERVER_NAMESPACE_END

postgresql/src/storages/postgres/tests/connection_pgtest.cpp

@@ -1,7 +1,6 @@
 #include <storages/postgres/tests/util_pgtest.hpp>
 
 #include <userver/concurrent/background_task_storage.hpp>
-#include <userver/engine/single_consumer_event.hpp>
 
 #include <storages/postgres/detail/connection.hpp>
 #include <userver/storages/postgres/dsn.hpp>
@@ -363,40 +362,6 @@ UTEST_P(PostgreConnection, StatementTimeout) {
     EXPECT_FALSE(GetConn()->IsBroken());
 }
 
-void CleanupConnectionTest(storages::postgres::detail::ConnectionPtr& conn, bool use_cancel) {
-    EXPECT_EQ(pg::ConnectionState::kIdle, conn->GetState());
-
-    const DefaultCommandControlScope scope(pg::CommandControl{utest::kMaxTestWaitTime, utest::kMaxTestWaitTime});
-
-    engine::SingleConsumerEvent task_started;
-    auto task = engine::AsyncNoSpan([&] {
-        task_started.Send();
-        UEXPECT_THROW(conn->Execute("select pg_sleep(1)"), pg::ConnectionInterrupted);
-    });
-    ASSERT_TRUE(task_started.WaitForEventFor(utest::kMaxTestWaitTime));
-    task.RequestCancel();
-    task.WaitFor(utest::kMaxTestWaitTime);
-    ASSERT_TRUE(task.IsFinished());
-
-    EXPECT_EQ(pg::ConnectionState::kTranActive, conn->GetState());
-    if (use_cancel) {
-        UEXPECT_NO_THROW(conn->CancelAndCleanup(utest::kMaxTestWaitTime));
-    } else {
-        UEXPECT_NO_THROW(conn->Cleanup(std::chrono::seconds{2}));
-    }
-    EXPECT_EQ(pg::ConnectionState::kIdle, conn->GetState());
-}
-
-UTEST_P(PostgreConnection, QueryTaskCancelAndCleanup) {
-    CheckConnection(GetConn());
-    CleanupConnectionTest(GetConn(), /*use cancel=*/true);
-}
-
-UTEST_P(PostgreConnection, QueryTaskCleanup) {
-    CheckConnection(GetConn());
-    CleanupConnectionTest(GetConn(), /*use cancel=*/false);
-}
-
 UTEST_P(PostgreConnection, CachedPlanChange) {
     // this only works with english messages, better than nothing
     GetConn()->Execute("SET lc_messages = 'en_US.UTF-8'");