From 08cbbdbeac8ea5e1e81c5735f51d59391da9f04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=91=D0=B5?= =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=BE=D0=B3=D0=BE=D0=B2?= Date: Fri, 23 Jan 2026 18:45:53 +0300 Subject: [PATCH] refactor(tests): Add ability to select the logging level --- .github/workflows/tests.yml | 2 ++ tarantool-shared-resources/logback-test.xml | 11 +++++++---- .../tarantool/config/ConfigurationUtils.java | 2 +- .../src/test/resources/logback-test.xml | 15 --------------- 4 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 testcontainers/src/test/resources/logback-test.xml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4792332..9729948 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,6 +28,8 @@ env: TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ps.tarantool.io/" # Переменная, используемая в тестах в качестве префикса к названию образа. Переопределяется локально, если необходимо TARANTOOL_REGISTRY: "registry.ps.tarantool.io/" +# Оперделим, включать ли логи для тестов + LOGBACK_LEVEL: ${{ secrets.ACTIONS_STEP_DEBUG == 'true' && 'INFO' || 'OFF' }} jobs: tests-unit: diff --git a/tarantool-shared-resources/logback-test.xml b/tarantool-shared-resources/logback-test.xml index a687cd0..8e248cc 100644 --- a/tarantool-shared-resources/logback-test.xml +++ b/tarantool-shared-resources/logback-test.xml @@ -1,14 +1,17 @@ + + + - + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + - - + + diff --git a/testcontainers/src/main/java/org/testcontainers/containers/tarantool/config/ConfigurationUtils.java b/testcontainers/src/main/java/org/testcontainers/containers/tarantool/config/ConfigurationUtils.java index 72c0d71..d549261 100644 --- a/testcontainers/src/main/java/org/testcontainers/containers/tarantool/config/ConfigurationUtils.java +++ b/testcontainers/src/main/java/org/testcontainers/containers/tarantool/config/ConfigurationUtils.java @@ -373,7 +373,7 @@ public static void bootstrap( .append(":") .append(uri.getPort()); - LOGGER.info("Start cluster bootstrap in '{}' container", router); + LOGGER.info("Start cluster bootstrap in '{}' container", router.node()); try { Unreliables.retryUntilSuccess( (int) bootstrapTimeout.getSeconds(), diff --git a/testcontainers/src/test/resources/logback-test.xml b/testcontainers/src/test/resources/logback-test.xml deleted file mode 100644 index 12e2712..0000000 --- a/testcontainers/src/test/resources/logback-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - -