From 2245a4fba8b814c43cddb4dd0bbc74eef94ed210 Mon Sep 17 00:00:00 2001
From: vdimir <vdimir@clickhouse.com>
Date: Mon, 23 Oct 2023 12:16:00 +0000
Subject: [PATCH] Fix test_store_cleanup/test.py after rebase

---
 tests/integration/test_store_cleanup/test.py | 134 -------------------
 1 file changed, 134 deletions(-)

diff --git a/tests/integration/test_store_cleanup/test.py b/tests/integration/test_store_cleanup/test.py
index ce12e12003e..6c5a20a758a 100644
--- a/tests/integration/test_store_cleanup/test.py
+++ b/tests/integration/test_store_cleanup/test.py
@@ -21,140 +21,6 @@ def started_cluster():
         cluster.shutdown()
 
 
-<<<<<<< HEAD:tests/integration/test_store_cleanup/test.py
-=======
-def remove_broken_detached_part_impl(table, node, expect_broken_prefix):
-    assert (
-        node.query(
-            f"SELECT COUNT() FROM system.parts WHERE table='{table}' AND active=1"
-        )
-        == "4\n"
-    )
-
-    path_to_detached = path_to_data + f"data/default/{table}/detached/"
-
-    result = node.exec_in_container(["ls", path_to_detached])
-    assert result.strip() == ""
-
-    corrupt_part_data_on_disk(node, table, "all_3_3_0")
-    break_part(node, table, "all_3_3_0")
-    node.query(f"ALTER TABLE {table} DETACH PART 'all_1_1_0'")
-    result = node.exec_in_container(["touch", f"{path_to_detached}trash"])
-
-    node.exec_in_container(["mkdir", f"{path_to_detached}../broken_all_fake"])
-    node.exec_in_container(
-        ["touch", "-t", "1312031429.30", f"{path_to_detached}../broken_all_fake"]
-    )
-    result = node.exec_in_container(["stat", f"{path_to_detached}../broken_all_fake"])
-    print(result)
-    assert "Modify: 2013-12-03" in result
-    node.exec_in_container(
-        [
-            "mv",
-            f"{path_to_detached}../broken_all_fake",
-            f"{path_to_detached}broken_all_fake",
-        ]
-    )
-
-    node.exec_in_container(["mkdir", f"{path_to_detached}../unexpected_all_42_1337_5"])
-    node.exec_in_container(
-        [
-            "touch",
-            "-t",
-            "1312031429.30",
-            f"{path_to_detached}../unexpected_all_42_1337_5",
-        ]
-    )
-    result = node.exec_in_container(
-        ["stat", f"{path_to_detached}../unexpected_all_42_1337_5"]
-    )
-    print(result)
-    assert "Modify: 2013-12-03" in result
-    node.exec_in_container(
-        [
-            "mv",
-            f"{path_to_detached}../unexpected_all_42_1337_5",
-            f"{path_to_detached}unexpected_all_42_1337_5",
-        ]
-    )
-
-    result = node.query(
-        f"CHECK TABLE {table}",
-        settings={"check_query_single_value_result": 0, "max_threads": 1},
-    )
-    assert "all_3_3_0\t0" in result
-
-    node.query(f"DETACH TABLE {table}")
-    node.query(f"ATTACH TABLE {table}")
-
-    result = node.exec_in_container(["ls", path_to_detached])
-    print(result)
-    assert f"{expect_broken_prefix}_all_3_3_0" in result
-    assert "all_1_1_0" in result
-    assert "trash" in result
-    assert "broken_all_fake" in result
-    assert "unexpected_all_42_1337_5" in result
-
-    time.sleep(15)
-    assert node.contains_in_log(
-        "Removed broken detached part unexpected_all_42_1337_5 due to a timeout"
-    )
-
-    result = node.exec_in_container(["ls", path_to_detached])
-    print(result)
-    assert f"{expect_broken_prefix}_all_3_3_0" not in result
-    assert "all_1_1_0" in result
-    assert "trash" in result
-    assert "broken_all_fake" in result
-    assert "unexpected_all_42_1337_5" not in result
-
-    node.query(f"DROP TABLE {table} SYNC")
-
-
-def test_remove_broken_detached_part_merge_tree(started_cluster):
-    node1.query(
-        """
-        CREATE TABLE
-            mt(id UInt32, value Int32)
-        ENGINE = MergeTree() ORDER BY id
-        SETTINGS
-            merge_tree_enable_clear_old_broken_detached=1,
-            merge_tree_clear_old_broken_detached_parts_ttl_timeout_seconds=5;
-        """
-    )
-
-    for i in range(4):
-        node1.query(
-            f"INSERT INTO mt SELECT number, number * number FROM numbers ({i * 100000}, 100000)"
-        )
-
-    remove_broken_detached_part_impl("mt", node1, "broken-on-start")
-
-
-def test_remove_broken_detached_part_replicated_merge_tree(started_cluster):
-    node1.query(
-        f"""
-        CREATE TABLE
-            replicated_mt(date Date, id UInt32, value Int32)
-        ENGINE = ReplicatedMergeTree('/clickhouse/tables/replicated_mt', '{node1.name}') ORDER BY id
-        SETTINGS
-            merge_tree_enable_clear_old_broken_detached=1,
-            merge_tree_clear_old_broken_detached_parts_ttl_timeout_seconds=5,
-            cleanup_delay_period=1,
-            cleanup_delay_period_random_add=0,
-            cleanup_thread_preferred_points_per_iteration=0;
-        """
-    )
-
-    for i in range(4):
-        node1.query(
-            f"INSERT INTO replicated_mt SELECT toDate('2019-10-01'), number, number * number FROM numbers ({i * 100000}, 100000)"
-        )
-
-    remove_broken_detached_part_impl("replicated_mt", node1, "broken")
-
-
->>>>>>> fed4cb07fc8 (Deterministic result for CHECK TABLE in tests):tests/integration/test_broken_detached_part_clean_up/test.py
 def test_store_cleanup(started_cluster):
     node1.query("CREATE DATABASE db UUID '10000000-1000-4000-8000-000000000001'")
     node1.query(