diff --git a/.github/workflows/Dockerfile.buster b/.github/workflows/Dockerfile.buster index 0760061761..9681a8bd07 100644 --- a/.github/workflows/Dockerfile.buster +++ b/.github/workflows/Dockerfile.buster @@ -3,9 +3,13 @@ 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 && \ + 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 && \ - 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 - && \ 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/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..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 PHP/tests/python/requirements.txt +pip3 install --user -r tests/python/requirements.txt ``` To run, use just one-line command: diff --git a/tests/python/requirements.txt b/tests/python/requirements.txt index 78fcf4b961..13e0560c01 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.2.0 pytest-mysql==2.3.1 pytest-postgresql==4.1.1 psycopg==3.1.9 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