You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by zh...@apache.org on 2025/04/27 06:24:33 UTC
(dolphinscheduler-sdk-python) 02/02: add show log into conftest
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch ci
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-sdk-python.git
commit 1e815b8335fca02789637f616fee70b5bd846cda
Author: Jay Chung <zh...@gmail.com>
AuthorDate: Sun Apr 27 14:24:11 2025 +0800
add show log into conftest
[run-it]
---
.github/workflows/ci.yaml | 4 ----
tests/integration/conftest.py | 10 +++++++++-
tests/testing/docker_wrapper.py | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9c59775..4d281f6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -212,10 +212,6 @@ jobs:
working-directory: src
run: |
python -m tox -vv -e integrate-test
- - name: check docker log
- run: |
- docker ps
- docker logs ci-dolphinscheduler-standalone-server
result:
name: CI
if: always()
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 9ec863c..cf17afb 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -17,12 +17,15 @@
"""py.test conftest.py file for package integration test."""
+import logging
import os
import pytest
from tests.testing.docker_wrapper import DockerWrapper
+logger = logging.getLogger(__name__)
+
@pytest.fixture(scope="package", autouse=True)
def docker_setup_teardown():
@@ -53,4 +56,9 @@ def docker_setup_teardown():
)
assert container is not None
yield
- # docker_wrapper.remove_container()
+ container_logs = container.logs()
+ logger.info(
+ "Finished integration tests run, Container logs: %s",
+ container_logs.decode("utf-8"),
+ )
+ docker_wrapper.remove_container()
diff --git a/tests/testing/docker_wrapper.py b/tests/testing/docker_wrapper.py
index ce8ba0c..866e365 100644
--- a/tests/testing/docker_wrapper.py
+++ b/tests/testing/docker_wrapper.py
@@ -75,7 +75,7 @@ class DockerWrapper:
log_byte = str.encode(log)
container = self.run(*args, **kwargs)
- timeout_threshold = 5 * 60
+ timeout_threshold = 6 * 60
start_time = time.time()
while time.time() <= start_time + timeout_threshold:
if log_byte in container.logs(tail=1000):