From c2c497e290af35cd4945f23136a8f07de737156d Mon Sep 17 00:00:00 2001
From: Pavel Kovalenko <jokserfn@yandex-team.ru>
Date: Sat, 12 Dec 2020 16:44:19 +0300
Subject: [PATCH] Use s3 disk explicitly for log tables in test_log_family_s3.

---
 tests/integration/test_log_family_s3/configs/minio.xml | 4 ++--
 tests/integration/test_log_family_s3/test.py           | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/integration/test_log_family_s3/configs/minio.xml b/tests/integration/test_log_family_s3/configs/minio.xml
index edcf1225142..7337be1ad94 100644
--- a/tests/integration/test_log_family_s3/configs/minio.xml
+++ b/tests/integration/test_log_family_s3/configs/minio.xml
@@ -2,13 +2,13 @@
 <yandex>
     <storage_configuration>
         <disks>
-            <default>
+            <s3>
                 <type>s3</type>
                 <endpoint>http://minio1:9001/root/data/</endpoint>
                 <access_key_id>minio</access_key_id>
                 <secret_access_key>minio123</secret_access_key>
                 <send_object_metadata>true</send_object_metadata>
-            </default>
+            </s3>
         </disks>
     </storage_configuration>
 </yandex>
diff --git a/tests/integration/test_log_family_s3/test.py b/tests/integration/test_log_family_s3/test.py
index 4ee370a7703..c23e7545b27 100644
--- a/tests/integration/test_log_family_s3/test.py
+++ b/tests/integration/test_log_family_s3/test.py
@@ -27,7 +27,6 @@ def cluster():
 def assert_objects_count(cluster, objects_count, path='data/'):
     minio = cluster.minio_client
     s3_objects = list(minio.list_objects(cluster.minio_bucket, path))
-    print(s3_objects, file=sys.stderr)
     if objects_count != len(s3_objects):
         for s3_object in s3_objects:
             object_meta = minio.stat_object(cluster.minio_bucket, s3_object.object_name)
@@ -41,7 +40,7 @@ def assert_objects_count(cluster, objects_count, path='data/'):
 def test_log_family_s3(cluster, log_engine, files_overhead, files_overhead_per_insert):
     node = cluster.instances["node"]
 
-    node.query("CREATE TABLE s3_test (id UInt64) Engine={}".format(log_engine))
+    node.query("CREATE TABLE s3_test (id UInt64) ENGINE={} SETTINGS disk = 's3'".format(log_engine))
 
     node.query("INSERT INTO s3_test SELECT number FROM numbers(5)")
     assert node.query("SELECT * FROM s3_test") == "0\n1\n2\n3\n4\n"