This is an automated email from the ASF dual-hosted git repository.
jason810496 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new e5465795a88 Fix flaky KubernetesPodOperator log-timestamp test (#69563)
e5465795a88 is described below
commit e5465795a887129c738c7c5d1e5f0a7b4bc421a8
Author: Dev-iL <[email protected]>
AuthorDate: Wed Jul 8 09:38:21 2026 +0300
Fix flaky KubernetesPodOperator log-timestamp test (#69563)
* Fix flaky KubernetesPodOperator log-timestamp test
The parametrize data for
test_fetch_container_logs_before_current_sec_various_logs
built each log line's timestamp and the test's `now` value from separate
pendulum.now() calls at collection time. When those calls straddled a second
boundary, the "timestamp equal to the current second" cases (3 and 6) would
intermittently fail because the values were no longer equal to the second.
Build timestamps as offsets from a single fixed reference instant instead.
* Sync Apache Kafka provider docs index with its msk extra
The msk extra was added to providers/apache/kafka/pyproject.toml without
regenerating docs/index.rst, so the extras table was missing the
corresponding row. CI's doc-sync check flags this drift on every PR
touching this branch, regardless of relevance, so fix it here to unblock.
---
providers/apache/kafka/docs/index.rst | 1 +
.../unit/cncf/kubernetes/utils/test_pod_manager.py | 55 +++++++---------------
2 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/providers/apache/kafka/docs/index.rst
b/providers/apache/kafka/docs/index.rst
index b3fc33f162a..cee81d3a021 100644
--- a/providers/apache/kafka/docs/index.rst
+++ b/providers/apache/kafka/docs/index.rst
@@ -149,6 +149,7 @@ Install them when installing from PyPI. For example:
Extra Dependencies
==================== ====================================================
``google`` ``apache-airflow-providers-google``
+``msk`` ``aws-msk-iam-sasl-signer-python>=1.0.1``
``common.messaging`` ``apache-airflow-providers-common-messaging>=2.0.0``
==================== ====================================================
diff --git
a/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
b/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
index 2f5245217d9..97f2aff6056 100644
---
a/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
+++
b/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/utils/test_pod_manager.py
@@ -1721,54 +1721,33 @@ class TestAsyncPodManager:
@pytest.mark.asyncio
@pytest.mark.parametrize(
- ("log_lines", "now", "expected_log_messages",
"not_expected_log_messages"),
+ ("log_line_offsets", "expected_log_messages",
"not_expected_log_messages"),
[
# Case 1: No logs
- ([], pendulum.now(), [], []),
+ ([], [], []),
# Case 2: One log line with timestamp before now
- (
- [f"{pendulum.now().subtract(seconds=2).to_iso8601_string()}
message"],
- pendulum.now(),
- ["message"],
- [],
- ),
+ ([(-2, "message")], ["message"], []),
# Case 3: Log line with timestamp equal to now (should be skipped,
so last_time is None)
- ([f"{pendulum.now().to_iso8601_string()} message"],
pendulum.now(), [], ["message"]),
+ ([(0, "message")], [], ["message"]),
# Case 4: Multiple log lines, last before now
- (
- [
- f"{pendulum.now().subtract(seconds=3).to_iso8601_string()}
msg1",
- f"{pendulum.now().subtract(seconds=2).to_iso8601_string()}
msg2",
- ],
- pendulum.now(),
- ["msg1", "msg2"],
- [],
- ),
+ ([(-3, "msg1"), (-2, "msg2")], ["msg1", "msg2"], []),
# Case 5: Log lines with continuation (no timestamp)
- (
- [
- f"{pendulum.now().subtract(seconds=2).to_iso8601_string()}
msg1",
- "continued line",
- ],
- pendulum.now(),
- ["msg1\ncontinued line"],
- [],
- ),
- # Case 6: Log lines with continuation (no timestamp)
- (
- [
- f"{pendulum.now().subtract(seconds=2).to_iso8601_string()}
msg1",
- f"{pendulum.now().to_iso8601_string()} msg2",
- ],
- pendulum.now(),
- ["msg1"],
- ["msg2"],
- ),
+ ([(-2, "msg1"), (None, "continued line")], ["msg1\ncontinued
line"], []),
+ # Case 6: Log line followed by one at the current second (the
latter should be skipped)
+ ([(-2, "msg1"), (0, "msg2")], ["msg1"], ["msg2"]),
],
)
async def test_fetch_container_logs_before_current_sec_various_logs(
- self, log_lines, now, expected_log_messages, not_expected_log_messages
+ self, log_line_offsets, expected_log_messages,
not_expected_log_messages
):
+ # Use a fixed reference instant instead of real wall-clock time:
building the
+ # log-line timestamps from separate `pendulum.now()` calls made the
"equal to
+ # the current second" cases flaky whenever those calls straddled a
second boundary.
+ now = pendulum.datetime(2024, 1, 1, 12, 0, 0)
+ log_lines = [
+ message if offset is None else
f"{now.add(seconds=offset).to_iso8601_string()} {message}"
+ for offset, message in log_line_offsets
+ ]
pod = mock.MagicMock()
container_name = "base"
since_time = now.subtract(minutes=1)
