From df17df67c229a47c012193cb8f503a511beb3b29 Mon Sep 17 00:00:00 2001 From: kssenii Date: Mon, 18 Jul 2022 17:20:09 +0200 Subject: [PATCH] Fix checks --- docker/test/stateful/Dockerfile | 4 ++++ docker/test/stateful/run.sh | 1 + tests/config/config.d/storage_conf.xml | 2 +- .../0_stateless/01343_min_bytes_to_use_mmap_io.reference | 2 +- .../01344_min_bytes_to_use_mmap_io_index.reference | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile index ef375f8b206..234d0861f8b 100644 --- a/docker/test/stateful/Dockerfile +++ b/docker/test/stateful/Dockerfile @@ -7,6 +7,8 @@ RUN apt-get update -y \ && env DEBIAN_FRONTEND=noninteractive \ apt-get install --yes --no-install-recommends \ python3-requests \ + nodejs \ + npm \ && apt-get clean COPY s3downloader /s3downloader @@ -14,5 +16,7 @@ COPY s3downloader /s3downloader ENV S3_URL="https://clickhouse-datasets.s3.amazonaws.com" ENV DATASETS="hits visits" +RUN npm install -g azurite + COPY run.sh / CMD ["/bin/bash", "/run.sh"] diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh index d77978c904b..be0b9f84a1b 100755 --- a/docker/test/stateful/run.sh +++ b/docker/test/stateful/run.sh @@ -18,6 +18,7 @@ ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test /usr/share/clickhouse-test/config/install.sh ./setup_minio.sh stateful +azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log & function start() { diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml index 68969ea7685..d3300683adf 100644 --- a/tests/config/config.d/storage_conf.xml +++ b/tests/config/config.d/storage_conf.xml @@ -78,7 +78,7 @@ azure_blob_storage http://localhost:10000/devstoreaccount1 cont - true + false false devstoreaccount1 diff --git a/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference b/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference index 620777635fc..ac3ce287de5 100644 --- a/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference +++ b/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference @@ -1,2 +1,2 @@ Hello, world -1 +2 diff --git a/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference b/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference index ac3ce287de5..0c0ff9c8e3b 100644 --- a/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference +++ b/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference @@ -1,2 +1,2 @@ Hello, world -2 +4