From 578d22ae94ea1704819e41ca1f0f7c8e58d92e32 Mon Sep 17 00:00:00 2001
From: Max K <maxkaynov@gmail.com>
Date: Thu, 11 Jul 2024 09:24:25 +0200
Subject: [PATCH] style

Automatic style fix

Automatic style fix
---
 .github/actionlint.yml               |  1 +
 .github/workflows/create_release.yml |  4 ++--
 pyproject.toml                       |  2 ++
 tests/ci/create_release.py           |  6 +++---
 tests/ci/docker_server.py            |  4 ++--
 tests/ci/style_check.py              | 14 +++++++++++---
 tests/clickhouse-test                |  6 +++---
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.github/actionlint.yml b/.github/actionlint.yml
index 0f88f30d42c..4357bd3eb6b 100644
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -7,3 +7,4 @@ self-hosted-runner:
     - stress-tester
     - style-checker
     - style-checker-aarch64
+    - release-maker
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index 7879c28ab8d..972aff90195 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -89,8 +89,8 @@ jobs:
             --volume=".:/ClickHouse" clickhouse/style-test \
             /ClickHouse/tests/ci/changelog.py -v --debug-helpers \
             --gh-user-or-token="$GH_TOKEN" --jobs=5 \
-            --output="/ClickHouse/docs/changelogs/${RELEASE_TAG}.md" "${RELEASE_TAG}"
-          git add ./docs/changelogs/${RELEASE_TAG}.md
+            --output="/ClickHouse/docs/changelogs/${{ env.RELEASE_TAG }}.md" ${{ env.RELEASE_TAG }}
+          git add ./docs/changelogs/${{ env.RELEASE_TAG }}.md
           echo "Generate Security"
           python3 ./utils/security-generator/generate_security.py > SECURITY.md
           git diff HEAD
diff --git a/pyproject.toml b/pyproject.toml
index 39511e1a0d3..c89d46c0929 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,6 +17,8 @@ src_paths = ["src", "tests/ci", "tests/sqllogic"]
 [tool.pylint.'MESSAGES CONTROL']
           # pytest.mark.parametrize is not callable (not-callable)
 disable = '''
+          pointless-string-statement,
+          line-too-long,
           missing-docstring,
           too-few-public-methods,
           invalid-name,
diff --git a/tests/ci/create_release.py b/tests/ci/create_release.py
index 83a51c66bce..7f4cf8c787a 100755
--- a/tests/ci/create_release.py
+++ b/tests/ci/create_release.py
@@ -40,7 +40,7 @@ class ShellRunner:
             return 0, ""
         print(f"Running shell command: [{command}]")
         if async_:
-            subprocess.Popen(command.split(" "))
+            subprocess.Popen(command.split(" "))  # pylint:disable=consider-using-with
             return 0, ""
         result = subprocess.run(
             command + " 2>&1",
@@ -316,9 +316,9 @@ class PackageDownloader:
     def __init__(self, release, commit_sha, version):
         assert version.startswith(release), "Invalid release branch or version"
         major, minor = map(int, release.split("."))
-        self.package_names = self.PACKAGES
+        self.package_names = list(self.PACKAGES)
         if major > 24 or (major == 24 and minor > 3):
-            self.package_names += self.EXTRA_PACKAGES
+            self.package_names += list(self.EXTRA_PACKAGES)
         self.release = release
         self.commit_sha = commit_sha
         self.version = version
diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
index 2f556e3ed57..21fc02ce02a 100644
--- a/tests/ci/docker_server.py
+++ b/tests/ci/docker_server.py
@@ -376,10 +376,10 @@ def main():
     repo_urls = {}
     direct_urls: Dict[str, List[str]] = {}
     if pr_info.event_type == EventType.PULL_REQUEST:
-        release_or_pr = pr_info.number
+        release_or_pr = str(pr_info.number)
         sha = pr_info.sha
     elif pr_info.event_type == EventType.PUSH and pr_info.is_master:
-        release_or_pr = 0
+        release_or_pr = str(0)
         sha = pr_info.sha
     else:
         release_or_pr = f"{args.version.major}.{args.version.minor}"
diff --git a/tests/ci/style_check.py b/tests/ci/style_check.py
index 6b58ecece8d..36620d44a2d 100644
--- a/tests/ci/style_check.py
+++ b/tests/ci/style_check.py
@@ -16,7 +16,15 @@ from docker_images_helper import get_docker_image, pull_image
 from env_helper import IS_CI, REPO_COPY, TEMP_PATH, GITHUB_EVENT_PATH
 from git_helper import GIT_PREFIX, git_runner
 from pr_info import PRInfo
-from report import ERROR, FAILURE, SUCCESS, JobReport, TestResults, read_test_results
+from report import (
+    ERROR,
+    FAILURE,
+    SUCCESS,
+    JobReport,
+    TestResults,
+    read_test_results,
+    FAIL,
+)
 from ssh import SSHKey
 from stopwatch import Stopwatch
 
@@ -204,8 +212,8 @@ def main():
     autofix_description = ""
     fail_cnt = 0
     for result in test_results:
-        if result.status == FAILURE:
-            # do not autofix if not only back failed
+        if result.status in (FAILURE, FAIL):
+            # do not autofix if not only black failed
             fail_cnt += 1
 
     if args.push and fail_cnt == 1:
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index 0cf46732354..90fb9611151 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -711,9 +711,9 @@ def get_localzone():
 
 class SettingsRandomizer:
     settings = {
-        "max_insert_threads": lambda: 12
-        if random.random() < 0.03
-        else random.randint(1, 3),
+        "max_insert_threads": lambda: (
+            12 if random.random() < 0.03 else random.randint(1, 3)
+        ),
         "group_by_two_level_threshold": threshold_generator(0.2, 0.2, 1, 1000000),
         "group_by_two_level_threshold_bytes": threshold_generator(
             0.2, 0.2, 1, 50000000