From c36f147b1633c7fab5cc23f9124f50ed6592d502 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 26 Mar 2021 10:05:56 +0300
Subject: [PATCH 1/2] Fix sleep_in_send_tables_status_ms/sleep_in_send_data_ms
 in integration tests

---
 tests/integration/test_secure_socket/test.py              | 8 ++++----
 .../configs/users.xml                                     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/integration/test_secure_socket/test.py b/tests/integration/test_secure_socket/test.py
index 337b6b05bd7..c2bad80bca0 100644
--- a/tests/integration/test_secure_socket/test.py
+++ b/tests/integration/test_secure_socket/test.py
@@ -12,7 +12,7 @@ NODES = {'node' + str(i): None for i in (1, 2)}
 config = '''<yandex>
     <profiles>
         <default>
-            <sleep_in_send_data>{sleep_in_send_data}</sleep_in_send_data>
+            <sleep_in_send_data_ms>{sleep_in_send_data_ms}</sleep_in_send_data_ms>
         </default>
     </profiles>
 </yandex>'''
@@ -45,12 +45,12 @@ def started_cluster():
 
 
 def test(started_cluster):
-    NODES['node2'].replace_config('/etc/clickhouse-server/users.d/users.xml', config.format(sleep_in_send_data=1000))
+    NODES['node2'].replace_config('/etc/clickhouse-server/users.d/users.xml', config.format(sleep_in_send_data_ms=1000000))
     
     attempts = 0
     while attempts < 1000:
-        setting = NODES['node2'].http_query("SELECT value FROM system.settings WHERE name='sleep_in_send_data'")
-        if int(setting) == 1000:
+        setting = NODES['node2'].http_query("SELECT value FROM system.settings WHERE name='sleep_in_send_data_ms'")
+        if int(setting) == 1000000:
             break
         time.sleep(0.1)
         attempts += 1
diff --git a/tests/integration/test_system_clusters_actual_information/configs/users.xml b/tests/integration/test_system_clusters_actual_information/configs/users.xml
index 156cd3a6b59..3dd68165fac 100644
--- a/tests/integration/test_system_clusters_actual_information/configs/users.xml
+++ b/tests/integration/test_system_clusters_actual_information/configs/users.xml
@@ -2,7 +2,7 @@
 <yandex>
     <profiles>
         <default>
-            <sleep_in_send_tables_status>5</sleep_in_send_tables_status>
+            <sleep_in_send_tables_status_ms>5000</sleep_in_send_tables_status_ms>
         </default>
     </profiles>
 </yandex>

From 5c0c6a9aecc7f05b6f0d73f6a84e937feaf42021 Mon Sep 17 00:00:00 2001
From: Kruglov Pavel <48961922+Avogar@users.noreply.github.com>
Date: Fri, 26 Mar 2021 18:16:15 +0300
Subject: [PATCH 2/2] Delete unused users.xml

---
 .../configs/users.xml                                     | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 tests/integration/test_system_clusters_actual_information/configs/users.xml

diff --git a/tests/integration/test_system_clusters_actual_information/configs/users.xml b/tests/integration/test_system_clusters_actual_information/configs/users.xml
deleted file mode 100644
index 3dd68165fac..00000000000
--- a/tests/integration/test_system_clusters_actual_information/configs/users.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<yandex>
-    <profiles>
-        <default>
-            <sleep_in_send_tables_status_ms>5000</sleep_in_send_tables_status_ms>
-        </default>
-    </profiles>
-</yandex>