From 6ca9a572527b474d81b779b62adbbf6c66eca755 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Sat, 9 Aug 2025 23:30:52 +0300 Subject: [PATCH 01/13] debugging python tests --- tests/python/tests/conftest.py | 11 +++++++++++ tests/python/tests/pytest.ini | 1 + 2 files changed, 12 insertions(+) diff --git a/tests/python/tests/conftest.py b/tests/python/tests/conftest.py index 4af7ee6c4a..2b29677807 100644 --- a/tests/python/tests/conftest.py +++ b/tests/python/tests/conftest.py @@ -2,3 +2,14 @@ import pytest from python.lib.conftest_impl import skip_k2_unsupported_test, skip_k2_unsupported_test_suite, skip_kphp_unsupported_test, skip_kphp_unsupported_test_suite + + +@pytest.hookimpl(hookwrapper=True) +def pytest_runtest_protocol(item: pytest.Item): + tw = item.config.get_terminal_writer() + + tw.write(f"START TEST: {item.nodeid}") + yield + tw.write("\n") + tw.write(f"FINISH TEST: {item.nodeid}") + tw.write("\n") diff --git a/tests/python/tests/pytest.ini b/tests/python/tests/pytest.ini index 8d203247dc..9954733287 100644 --- a/tests/python/tests/pytest.ini +++ b/tests/python/tests/pytest.ini @@ -1,4 +1,5 @@ [pytest] +addopts = -v markers = k2_skip: mark a test as k2 skip k2_skip_suite: mark test suite as k2 skip From b0337056f944808a8418f601e6572c3f2c07d2db Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Tue, 12 Aug 2025 13:16:57 +0300 Subject: [PATCH 02/13] use plugin --- tests/python/requirements.txt | 1 + tests/python/tests/conftest.py | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index 78fcf4b961..0a98d9b6cb 100644 --- a/tests/python/requirements.txt +++ b/tests/python/requirements.txt @@ -6,6 +6,7 @@ requests==2.31.0 urllib3==1.26.12 requests-toolbelt==0.9.1 pytest==7.3.1 +pytest-durations==1.5.2 pytest-mysql==2.3.1 pytest-postgresql==4.1.1 psycopg==3.1.9 diff --git a/tests/python/tests/conftest.py b/tests/python/tests/conftest.py index 2b29677807..eb4da518f2 100644 --- a/tests/python/tests/conftest.py +++ b/tests/python/tests/conftest.py @@ -1,15 +1,3 @@ -import os import pytest from python.lib.conftest_impl import skip_k2_unsupported_test, skip_k2_unsupported_test_suite, skip_kphp_unsupported_test, skip_kphp_unsupported_test_suite - - -@pytest.hookimpl(hookwrapper=True) -def pytest_runtest_protocol(item: pytest.Item): - tw = item.config.get_terminal_writer() - - tw.write(f"START TEST: {item.nodeid}") - yield - tw.write("\n") - tw.write(f"FINISH TEST: {item.nodeid}") - tw.write("\n") From 81858d708c0aca33477702d946e5141c823db2e0 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Tue, 12 Aug 2025 18:51:48 +0300 Subject: [PATCH 03/13] fix buster build --- .github/workflows/Dockerfile.buster | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 0760061761..ca9c3dcfac 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -3,9 +3,12 @@ ARG DEBIAN_FRONTEND=noninteractive COPY tests/python/requirements.txt /tmp/ +RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list + RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ - echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list && \ wget -qO /etc/apt/trusted.gpg.d/vkpartner.asc https://artifactory-external.vkpartner.ru/artifactory/api/gpg/key/public && \ echo "deb https://artifactory-external.vkpartner.ru/artifactory/kphp buster main" >> /etc/apt/sources.list && \ wget -qO - https://debian.octopuce.fr/snapshots/sury-php/buster-latest/apt.gpg | apt-key add - && \ From 4184f1551c63f1cf871dffe22e5d384ec1978451 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Tue, 12 Aug 2025 18:59:35 +0300 Subject: [PATCH 04/13] fix buster build --- .github/workflows/Dockerfile.buster | 7 ++++--- tests/python/requirements.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index ca9c3dcfac..003e28953f 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -3,9 +3,10 @@ ARG DEBIAN_FRONTEND=noninteractive COPY tests/python/requirements.txt /tmp/ -RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.list && \ - echo "deb http://archive.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \ - echo "deb http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list +RUN echo "deb https://archive.debian.org/debian buster main" > /etc/apt/sources.list && \ + echo "deb https://archive.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \ + echo "deb https://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \ + echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index 0a98d9b6cb..13e0560c01 100644 --- a/tests/python/requirements.txt +++ b/tests/python/requirements.txt @@ -6,7 +6,7 @@ requests==2.31.0 urllib3==1.26.12 requests-toolbelt==0.9.1 pytest==7.3.1 -pytest-durations==1.5.2 +pytest-durations==1.2.0 pytest-mysql==2.3.1 pytest-postgresql==4.1.1 psycopg==3.1.9 From 378573e05c792a0640b459589374f9c5a0f87084 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Tue, 12 Aug 2025 19:04:13 +0300 Subject: [PATCH 05/13] fix buster build --- .github/workflows/Dockerfile.buster | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 003e28953f..492c199370 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -3,10 +3,10 @@ ARG DEBIAN_FRONTEND=noninteractive COPY tests/python/requirements.txt /tmp/ -RUN echo "deb https://archive.debian.org/debian buster main" > /etc/apt/sources.list && \ - echo "deb https://archive.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \ - echo "deb https://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \ - echo "deb https://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list +RUN echo "deb http://archive.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian-security buster/updates main contrib non-free" >> /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian buster-backports main contrib non-free" >> /etc/apt/sources.list RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ From bdd89e858004b0f4748a33f13584de4625a9c7c5 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Tue, 12 Aug 2025 19:30:47 +0300 Subject: [PATCH 06/13] update Python dependency --- .github/workflows/pr-code-format.yml | 2 +- tests/python/requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-code-format.yml b/.github/workflows/pr-code-format.yml index f12b534178..c4a29dc37c 100644 --- a/.github/workflows/pr-code-format.yml +++ b/.github/workflows/pr-code-format.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 - name: Install clang-format - run: sudo apt install -y clang-format-18 + run: sudo apt-get install -y clang-format-18 - name: Run clang-format on changed files run: | diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index 13e0560c01..8260064010 100644 --- a/tests/python/requirements.txt +++ b/tests/python/requirements.txt @@ -2,8 +2,8 @@ wheel==0.38.1 jsonschema==4.17.3 portalocker==2.7.0 psutil==5.9.5 -requests==2.31.0 -urllib3==1.26.12 +requests==2.32.2 +urllib3==2.0.2 requests-toolbelt==0.9.1 pytest==7.3.1 pytest-durations==1.2.0 From 1b89cd2972c8fbe74fa32d124066f370324cac7f Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Tue, 12 Aug 2025 19:38:24 +0300 Subject: [PATCH 07/13] update Python dependency --- .github/workflows/Dockerfile.buster | 2 +- .github/workflows/Dockerfile.focal | 2 +- .github/workflows/Dockerfile.jammy | 4 ++-- .github/workflows/debian.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .../writing-and-running-tests.md | 2 +- tests/{python => }/requirements.txt | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename tests/{python => }/requirements.txt (87%) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 492c199370..a81ee20c40 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -1,7 +1,7 @@ FROM debian:buster ARG DEBIAN_FRONTEND=noninteractive -COPY tests/python/requirements.txt /tmp/ +COPY tests/requirements.txt /tmp/ RUN echo "deb http://archive.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \ echo "deb http://archive.debian.org/debian-security buster/updates main contrib non-free" >> /etc/apt/sources.list && \ diff --git a/.github/workflows/Dockerfile.focal b/.github/workflows/Dockerfile.focal index 133422908a..3dc0549a95 100644 --- a/.github/workflows/Dockerfile.focal +++ b/.github/workflows/Dockerfile.focal @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ARG DEBIAN_FRONTEND=noninteractive -COPY tests/python/requirements.txt /tmp/ +COPY tests/requirements.txt /tmp/ RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget pkg-config software-properties-common && \ diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy index 451bef70fa..86deb123c5 100644 --- a/.github/workflows/Dockerfile.jammy +++ b/.github/workflows/Dockerfile.jammy @@ -1,7 +1,7 @@ FROM ubuntu:22.04 ARG DEBIAN_FRONTEND=noninteractive -COPY tests/python/requirements.txt /tmp/ +COPY tests/requirements.txt /tmp/ # package software-properties-common, repo ppa:ondrej/php are only required for installing # php 7.4 on ubuntu 22, where default php version is 8.1 @@ -17,7 +17,7 @@ RUN apt update && \ apt update && \ apt install -y --no-install-recommends \ build-essential devscripts fakeroot git cmake make g++ lld gperf netcat patch re2c \ - python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools && \ + python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-setuptools && \ apt install -y --no-install-recommends libfmt-dev libgtest-dev libgmock-dev libpcre3-dev \ zlib1g-dev php7.4-dev unzip && \ # Install MySQL-related and PostgreSQL-related libraries from the Ubuntu 20.04 (Focal Fossa) repository. diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index a3f06736b8..4ecdf6c263 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -39,7 +39,7 @@ jobs: id: docker-image-cache with: path: kphp-build-env-${{matrix.os}}.tar - key: docker-image-cache-${{matrix.os}}-${{ hashFiles('.github/workflows/Dockerfile.*', 'tests/python/requirements.txt') }} + key: docker-image-cache-${{matrix.os}}-${{ hashFiles('.github/workflows/Dockerfile.*', 'tests/requirements.txt') }} - name: Build and save docker image if: steps.docker-image-cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index cb05278a43..82d576fe10 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -49,7 +49,7 @@ jobs: id: docker-image-cache with: path: kphp-build-env-${{matrix.os}}.tar - key: docker-image-cache-${{matrix.os}}-${{ hashFiles('.github/workflows/Dockerfile.*', 'tests/python/requirements.txt') }} + key: docker-image-cache-${{matrix.os}}-${{ hashFiles('.github/workflows/Dockerfile.*', 'tests/requirements.txt') }} - name: Build and save docker image if: steps.docker-image-cache.outputs.cache-hit != 'true' diff --git a/docs/kphp-internals/developing-and-extending-kphp/writing-and-running-tests.md b/docs/kphp-internals/developing-and-extending-kphp/writing-and-running-tests.md index 13bcd48286..f40f2aed9a 100644 --- a/docs/kphp-internals/developing-and-extending-kphp/writing-and-running-tests.md +++ b/docs/kphp-internals/developing-and-extending-kphp/writing-and-running-tests.md @@ -31,7 +31,7 @@ They perform complex scenarios like: compile and start HTTP server, send request Before running them, you should once perform a setup: ```bash -pip3 install --user -r PHP/tests/python/requirements.txt +pip3 install --user -r tests/requirements.txt ``` To run, use just one-line command: diff --git a/tests/python/requirements.txt b/tests/requirements.txt similarity index 87% rename from tests/python/requirements.txt rename to tests/requirements.txt index 8260064010..13e0560c01 100644 --- a/tests/python/requirements.txt +++ b/tests/requirements.txt @@ -2,8 +2,8 @@ wheel==0.38.1 jsonschema==4.17.3 portalocker==2.7.0 psutil==5.9.5 -requests==2.32.2 -urllib3==2.0.2 +requests==2.31.0 +urllib3==1.26.12 requests-toolbelt==0.9.1 pytest==7.3.1 pytest-durations==1.2.0 From f8e6296771ba16bb1beabeb083c3e3d915cde875 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Tue, 12 Aug 2025 19:49:25 +0300 Subject: [PATCH 08/13] update Python dependency --- .github/workflows/Dockerfile.jammy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy index 86deb123c5..ae5e6cf6e1 100644 --- a/.github/workflows/Dockerfile.jammy +++ b/.github/workflows/Dockerfile.jammy @@ -17,7 +17,7 @@ RUN apt update && \ apt update && \ apt install -y --no-install-recommends \ build-essential devscripts fakeroot git cmake make g++ lld gperf netcat patch re2c \ - python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-setuptools && \ + python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools && \ apt install -y --no-install-recommends libfmt-dev libgtest-dev libgmock-dev libpcre3-dev \ zlib1g-dev php7.4-dev unzip && \ # Install MySQL-related and PostgreSQL-related libraries from the Ubuntu 20.04 (Focal Fossa) repository. From 6c273267608585eb435785850834e0fb04b4bbc9 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Wed, 13 Aug 2025 04:38:14 +0300 Subject: [PATCH 09/13] fix Docker images --- .github/workflows/Dockerfile.buster | 2 +- .github/workflows/Dockerfile.focal | 2 +- .github/workflows/Dockerfile.jammy | 2 +- .github/workflows/debian.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .../developing-and-extending-kphp/writing-and-running-tests.md | 2 +- tests/{ => python}/requirements.txt | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename tests/{ => python}/requirements.txt (100%) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index a81ee20c40..492c199370 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -1,7 +1,7 @@ FROM debian:buster ARG DEBIAN_FRONTEND=noninteractive -COPY tests/requirements.txt /tmp/ +COPY tests/python/requirements.txt /tmp/ RUN echo "deb http://archive.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \ echo "deb http://archive.debian.org/debian-security buster/updates main contrib non-free" >> /etc/apt/sources.list && \ diff --git a/.github/workflows/Dockerfile.focal b/.github/workflows/Dockerfile.focal index 3dc0549a95..133422908a 100644 --- a/.github/workflows/Dockerfile.focal +++ b/.github/workflows/Dockerfile.focal @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ARG DEBIAN_FRONTEND=noninteractive -COPY tests/requirements.txt /tmp/ +COPY tests/python/requirements.txt /tmp/ RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget pkg-config software-properties-common && \ diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy index ae5e6cf6e1..451bef70fa 100644 --- a/.github/workflows/Dockerfile.jammy +++ b/.github/workflows/Dockerfile.jammy @@ -1,7 +1,7 @@ FROM ubuntu:22.04 ARG DEBIAN_FRONTEND=noninteractive -COPY tests/requirements.txt /tmp/ +COPY tests/python/requirements.txt /tmp/ # package software-properties-common, repo ppa:ondrej/php are only required for installing # php 7.4 on ubuntu 22, where default php version is 8.1 diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 4ecdf6c263..a3f06736b8 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -39,7 +39,7 @@ jobs: id: docker-image-cache with: path: kphp-build-env-${{matrix.os}}.tar - key: docker-image-cache-${{matrix.os}}-${{ hashFiles('.github/workflows/Dockerfile.*', 'tests/requirements.txt') }} + key: docker-image-cache-${{matrix.os}}-${{ hashFiles('.github/workflows/Dockerfile.*', 'tests/python/requirements.txt') }} - name: Build and save docker image if: steps.docker-image-cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 82d576fe10..cb05278a43 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -49,7 +49,7 @@ jobs: id: docker-image-cache with: path: kphp-build-env-${{matrix.os}}.tar - key: docker-image-cache-${{matrix.os}}-${{ hashFiles('.github/workflows/Dockerfile.*', 'tests/requirements.txt') }} + key: docker-image-cache-${{matrix.os}}-${{ hashFiles('.github/workflows/Dockerfile.*', 'tests/python/requirements.txt') }} - name: Build and save docker image if: steps.docker-image-cache.outputs.cache-hit != 'true' diff --git a/docs/kphp-internals/developing-and-extending-kphp/writing-and-running-tests.md b/docs/kphp-internals/developing-and-extending-kphp/writing-and-running-tests.md index f40f2aed9a..51718f621f 100644 --- a/docs/kphp-internals/developing-and-extending-kphp/writing-and-running-tests.md +++ b/docs/kphp-internals/developing-and-extending-kphp/writing-and-running-tests.md @@ -31,7 +31,7 @@ They perform complex scenarios like: compile and start HTTP server, send request Before running them, you should once perform a setup: ```bash -pip3 install --user -r tests/requirements.txt +pip3 install --user -r tests/python/requirements.txt ``` To run, use just one-line command: diff --git a/tests/requirements.txt b/tests/python/requirements.txt similarity index 100% rename from tests/requirements.txt rename to tests/python/requirements.txt From 13ad1c5ca05829529b93d49377063cfa5f741b54 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Wed, 13 Aug 2025 06:30:19 +0300 Subject: [PATCH 10/13] python --- tests/python/tests/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/python/tests/conftest.py b/tests/python/tests/conftest.py index eb4da518f2..4af7ee6c4a 100644 --- a/tests/python/tests/conftest.py +++ b/tests/python/tests/conftest.py @@ -1,3 +1,4 @@ +import os import pytest from python.lib.conftest_impl import skip_k2_unsupported_test, skip_k2_unsupported_test_suite, skip_kphp_unsupported_test, skip_kphp_unsupported_test_suite From c823254751f846b015578c2e81dc96c3c8db2c7c Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Wed, 13 Aug 2025 07:11:45 +0300 Subject: [PATCH 11/13] images --- .github/workflows/Dockerfile.buster | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 492c199370..9681a8bd07 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -3,10 +3,10 @@ ARG DEBIAN_FRONTEND=noninteractive COPY tests/python/requirements.txt /tmp/ -RUN echo "deb http://archive.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \ - echo "deb http://archive.debian.org/debian-security buster/updates main contrib non-free" >> /etc/apt/sources.list && \ - echo "deb http://archive.debian.org/debian buster-updates main contrib non-free" >> /etc/apt/sources.list && \ - echo "deb http://archive.debian.org/debian buster-backports main contrib non-free" >> /etc/apt/sources.list +RUN echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list RUN apt-get update && \ apt-get install -y --no-install-recommends apt-utils ca-certificates gnupg wget lsb-release && \ From 869f0f75c832f9661a373b1605b125a3c616a781 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Wed, 13 Aug 2025 07:54:20 +0300 Subject: [PATCH 12/13] WTF --- tests/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index 13e0560c01..b82758ac1b 100644 --- a/tests/python/requirements.txt +++ b/tests/python/requirements.txt @@ -6,7 +6,7 @@ requests==2.31.0 urllib3==1.26.12 requests-toolbelt==0.9.1 pytest==7.3.1 -pytest-durations==1.2.0 +#pytest-durations==1.2.0 pytest-mysql==2.3.1 pytest-postgresql==4.1.1 psycopg==3.1.9 From 1df6f133950634e16f29f3204b2e2b97ff6e80d5 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Wed, 13 Aug 2025 08:46:49 +0300 Subject: [PATCH 13/13] returned python-durations --- tests/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index b82758ac1b..13e0560c01 100644 --- a/tests/python/requirements.txt +++ b/tests/python/requirements.txt @@ -6,7 +6,7 @@ requests==2.31.0 urllib3==1.26.12 requests-toolbelt==0.9.1 pytest==7.3.1 -#pytest-durations==1.2.0 +pytest-durations==1.2.0 pytest-mysql==2.3.1 pytest-postgresql==4.1.1 psycopg==3.1.9