|
31 | 31 | b'2025-05-13T07:26:14.132Z [apify] DEBUG c\n', |
32 | 32 | b'2025-05-13T0', # Chunked log that got split in the marker |
33 | 33 | b'7:26:14.132Z [apify] DEBUG d\n' # part 2 |
34 | | - b'2025-05-13T07:26:14.132Z [apify] DEB', # Chunked log that got split outside of marker |
| 34 | + b'2025-05-13T07:27:14.132Z [apify] DEB', # Chunked log that got split outside of marker |
35 | 35 | b'UG e\n', # part 2 |
36 | 36 | # Already redirected message |
37 | | - b'2025-05-16T12:08:50.123Z [apify.redirect-logger-4U1oAnKau6jpzjUuA] -> 2025-05-16T12:08:49.840Z ACTOR: Pulling\n', |
| 37 | + b'2025-05-13T07:28:14.132Z [apify.redirect-logger-4U1oAnKau6jpzjUuA] -> 2025-05-13T07:27:14.132Z ACTOR: Pulling\n', |
38 | 38 | ) |
39 | | -_CHUNKED_MESSAGES_COUNT = 3 |
| 39 | +_EXISTING_LOGS_BEFORE_REDIRECT_ATTACH = 3 |
40 | 40 |
|
41 | 41 | _EXPECTED_MESSAGES_AND_LEVELS = ( |
42 | 42 | ('2025-05-13T07:24:12.588Z ACTOR: Pulling Docker image of build.', logging.INFO), |
|
47 | 47 | ('2025-05-13T07:25:14.132Z [apify] WARNING some warning', logging.WARNING), |
48 | 48 | ('2025-05-13T07:26:14.132Z [apify] DEBUG c', logging.DEBUG), |
49 | 49 | ('2025-05-13T07:26:14.132Z [apify] DEBUG d', logging.DEBUG), |
50 | | - ('2025-05-13T07:26:14.132Z [apify] DEBUG e', logging.DEBUG), |
| 50 | + ('2025-05-13T07:27:14.132Z [apify] DEBUG e', logging.DEBUG), |
51 | 51 | ( |
52 | | - '2025-05-16T12:08:50.123Z [apify.redirect-logger-4U1oAnKau6jpzjUuA] -> 2025-05-16T12:08:49.840Z ACTOR: Pulling', |
| 52 | + '2025-05-13T07:28:14.132Z [apify.redirect-logger-4U1oAnKau6jpzjUuA] -> 2025-05-13T07:27:14.132Z ACTOR: Pulling', |
53 | 53 | logging.INFO, |
54 | 54 | ), |
55 | 55 | ) |
@@ -135,7 +135,10 @@ def propagate_stream_logs() -> None: |
135 | 135 |
|
136 | 136 | @pytest.mark.parametrize( |
137 | 137 | ('log_from_start', 'expected_log_count'), |
138 | | - [(True, len(_EXPECTED_MESSAGES_AND_LEVELS)), (False, len(_EXPECTED_MESSAGES_AND_LEVELS) - _CHUNKED_MESSAGES_COUNT)], |
| 138 | + [ |
| 139 | + (True, len(_EXPECTED_MESSAGES_AND_LEVELS)), |
| 140 | + (False, len(_EXPECTED_MESSAGES_AND_LEVELS) - _EXISTING_LOGS_BEFORE_REDIRECT_ATTACH), |
| 141 | + ], |
139 | 142 | ) |
140 | 143 | @respx.mock |
141 | 144 | async def test_redirected_logs_async( |
@@ -171,7 +174,10 @@ async def test_redirected_logs_async( |
171 | 174 |
|
172 | 175 | @pytest.mark.parametrize( |
173 | 176 | ('log_from_start', 'expected_log_count'), |
174 | | - [(True, len(_EXPECTED_MESSAGES_AND_LEVELS)), (False, len(_EXPECTED_MESSAGES_AND_LEVELS) - _CHUNKED_MESSAGES_COUNT)], |
| 177 | + [ |
| 178 | + (True, len(_EXPECTED_MESSAGES_AND_LEVELS)), |
| 179 | + (False, len(_EXPECTED_MESSAGES_AND_LEVELS) - _EXISTING_LOGS_BEFORE_REDIRECT_ATTACH), |
| 180 | + ], |
175 | 181 | ) |
176 | 182 | @respx.mock |
177 | 183 | def test_redirected_logs_sync( |
|
0 commit comments