From a18fd8bdfc7d504c7319b721a22c549880f31928 Mon Sep 17 00:00:00 2001
From: Kseniia Sumarokova <54203879+kssenii@users.noreply.github.com>
Date: Wed, 10 Nov 2021 17:20:25 +0300
Subject: [PATCH 1/2] Fix

---
 tests/integration/test_storage_hdfs/test.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index 64f94a52a70..30f31bc0728 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -238,11 +238,21 @@ def test_virtual_columns(started_cluster):
 def test_read_files_with_spaces(started_cluster):
     hdfs_api = started_cluster.hdfs_api
 
-    hdfs_api.write_data("/test test test 1.txt", "1\n")
-    hdfs_api.write_data("/test test test 2.txt", "2\n")
-    hdfs_api.write_data("/test test test 3.txt", "3\n")
-    node1.query("create table test (id UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/test*', 'TSV')")
+    fs = HdfsClient(hosts=started_cluster.hdfs_ip)
+    dir = '/test_spaces'
+    exists = fs.exists(dir)
+    if exists:
+        fs.delete(dir, recursive=True)
+    fs.mkdirs(dir)
+
+    hdfs_api.write_data(f"{dir}/test test test 1.txt", "1\n")
+    hdfs_api.write_data(f"{dir}/test test test 2.txt", "2\n")
+    hdfs_api.write_data(f"{dir}/test test test 3.txt", "3\n")
+
+    node1.query(f"create table test (id UInt32) ENGINE = HDFS('hdfs://hdfs1:9000/{dir}/test*', 'TSV')")
     assert node1.query("select * from test order by id") == "1\n2\n3\n"
+    fs.delete(dir, recursive=True)
+
 
 
 def test_truncate_table(started_cluster):

From f3dc7c0e5d6e8adb7039946a054d44eb6ef52e55 Mon Sep 17 00:00:00 2001
From: Kseniia Sumarokova <54203879+kssenii@users.noreply.github.com>
Date: Wed, 10 Nov 2021 17:21:25 +0300
Subject: [PATCH 2/2] Update test.py

---
 tests/integration/test_storage_hdfs/test.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index 30f31bc0728..c6598292ba4 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -2,6 +2,7 @@ import os
 
 import pytest
 from helpers.cluster import ClickHouseCluster
+from pyhdfs import HdfsClient
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1', with_hdfs=True)