Fixing muted SQS tests (#1234)

Fix some muted SQS functional tests

5 files changed, 19 insertions, 22 deletions

diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt
index f39c2ec9925..ee757f885d8 100644
--- a/.github/config/muted_ya.txt
+++ b/.github/config/muted_ya.txt
@@ -44,11 +44,6 @@ ydb/tests/functional/clickbench test.py.test_run_*column]
 ydb/tests/functional/kqp/kqp_query_session KqpQuerySession.NoLocalAttach
 ydb/tests/functional/postgresql test_postgres.py.TestPostgresSuite.test_postgres_suite*
 ydb/tests/functional/restarts test_restarts.py.*
-ydb/tests/functional/sqs/cloud test_yandex_cloud_mode.py.TestSqsYandexCloudMode.test_dlq_mechanics_in_cloud*
-ydb/tests/functional/sqs/cloud test_yandex_cloud_queue_counters.py.TestYmqQueueCounters.test_purge_queue_counters
-ydb/tests/functional/sqs/common test_queue_counters.py.TestSqsGettingCounters.test_purge_queue_counters
-ydb/tests/functional/sqs/large test_leader_start_inflight.py.TestSqsMultinodeCluster.test_limit_leader_start_inflight[tables_format*]
-ydb/tests/functional/sqs/large [*/10]*
 ydb/tests/functional/sqs/merge_split_common_table/fifo *
 ydb/tests/functional/sqs/merge_split_common_table/std *
 ydb/tests/functional/tenants test_dynamic_tenants.py.*
diff --git a/ydb/tests/functional/sqs/cloud/test_yandex_cloud_mode.py b/ydb/tests/functional/sqs/cloud/test_yandex_cloud_mode.py
index 181950b355b..b59d8600a00 100644
--- a/ydb/tests/functional/sqs/cloud/test_yandex_cloud_mode.py
+++ b/ydb/tests/functional/sqs/cloud/test_yandex_cloud_mode.py
@@ -487,13 +487,18 @@ class TestSqsYandexCloudMode(get_test_with_sqs_tenant_installation(KikimrSqsTest
             delete_result, not_none()
         )
 
-        # shouldn't get any error
-        result_list = self._read_single_message_no_wait(queue1_url)
-        assert len(result_list) == 0 or result_list[0]['Body'] == msg_body
+        # waiting until the message appears in queue1 again
+        result_list = self._read_while_not_empty(
+            queue_url = queue1_url,
+            messages_count=1,
+            visibility_timeout=0,
+            wait_timeout=10
+        )
+        assert_that(result_list[0]['Body'], equal_to(msg_body))
 
-        # ok, getting the message again
+        # getting the message until it's moved to dlq
         for i in range(max_receive_count):
-            assert_that(self._read_single_message_no_wait(queue1_url)[0]['Body'], equal_to(msg_body))
+            self._read_single_message_no_wait(queue1_url)
 
         # check moved messages counter
         counters = self._get_sqs_counters(counters_format='text')
diff --git a/ydb/tests/functional/sqs/cloud/test_yandex_cloud_queue_counters.py b/ydb/tests/functional/sqs/cloud/test_yandex_cloud_queue_counters.py
index 89aad62cd44..5b428331cd5 100644
--- a/ydb/tests/functional/sqs/cloud/test_yandex_cloud_queue_counters.py
+++ b/ydb/tests/functional/sqs/cloud/test_yandex_cloud_queue_counters.py
@@ -189,15 +189,13 @@ class TestYmqQueueCounters(get_test_with_sqs_tenant_installation(KikimrSqsTestBa
         queue_url = self._sqs_api.create_queue(self.queue_name)
         queue_resource_id = self._get_queue_resource_id(queue_url, self.queue_name)
 
-        self._sqs_api.send_message(queue_url, "foo")
-        self._sqs_api.purge_queue(queue_url)
-
-        self._sqs_api.send_message(queue_url, "bar")
-        self._sqs_api.purge_queue(queue_url)
+        for _ in range(20):
+            self._sqs_api.send_message(queue_url, "foobar")
+            self._sqs_api.purge_queue(queue_url)
 
         ymq_counters = self._get_ymq_counters(cloud=self.cloud_id, folder=self.folder_id)
         purged_derivative = self._get_counter_value(ymq_counters, {
             'queue': queue_resource_id,
             'name': 'queue.messages.purged_count_per_second',
         })
-        assert purged_derivative == 1
+        assert purged_derivative > 0
diff --git a/ydb/tests/functional/sqs/common/test_queue_counters.py b/ydb/tests/functional/sqs/common/test_queue_counters.py
index e6c97afab5b..f4e133bc19f 100644
--- a/ydb/tests/functional/sqs/common/test_queue_counters.py
+++ b/ydb/tests/functional/sqs/common/test_queue_counters.py
@@ -141,11 +141,10 @@ class TestSqsGettingCounters(KikimrSqsTestBase):
 
     def test_purge_queue_counters(self):
         queue_url = self._create_queue_and_assert(self.queue_name, False, True)
-        self._sqs_api.send_message(queue_url, "foo")
-        self._sqs_api.purge_queue(queue_url)
 
-        self._sqs_api.send_message(queue_url, "bar")
-        self._sqs_api.purge_queue(queue_url)
+        for _ in range(20):
+            self._sqs_api.send_message(queue_url, "foobar")
+            self._sqs_api.purge_queue(queue_url)
 
         sqs_counters = self._get_sqs_counters()
 
@@ -153,4 +152,4 @@ class TestSqsGettingCounters(KikimrSqsTestBase):
             'queue': self.queue_name,
             'sensor': 'MessagesPurged',
         })
-        assert purged_derivative == 1
+        assert purged_derivative > 0
diff --git a/ydb/tests/functional/sqs/large/test_leader_start_inflight.py b/ydb/tests/functional/sqs/large/test_leader_start_inflight.py
index 9e74ae3e31e..0ffdd214ba1 100644
--- a/ydb/tests/functional/sqs/large/test_leader_start_inflight.py
+++ b/ydb/tests/functional/sqs/large/test_leader_start_inflight.py
@@ -41,7 +41,7 @@ class TestSqsMultinodeCluster(KikimrSqsTestBase):
         self._init_with_params(is_fifo, tables_format)
 
         queues = []
-        for i in range(100):
+        for i in range(20):
             queues.append(self._create_queue_and_assert(f'{i}_{self.queue_name}', is_fifo=is_fifo))
 
         def send_messages():