|
30 | 30 |
|
31 | 31 | from tests_common.test_utils.config import conf_vars
|
32 | 32 | from tests_common.test_utils.db import clear_db_dags, clear_db_runs
|
33 |
| -from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS |
| 33 | +from tests_common.test_utils.version_compat import AIRFLOW_V_3_0, AIRFLOW_V_3_0_PLUS |
34 | 34 |
|
35 | 35 |
|
36 | 36 | @pytest.mark.db_test
|
@@ -119,7 +119,10 @@ def test_should_read_logs_from_remote(self, mock_blob, mock_client, mock_creds,
|
119 | 119 | assert logs[0].sources == [expected_gs_uri]
|
120 | 120 | assert logs[1].event == "::endgroup::"
|
121 | 121 | assert logs[2].event == "CONTENT"
|
122 |
| - assert metadata == {"end_of_log": True, "first_time_read": False} |
| 122 | + if AIRFLOW_V_3_0: |
| 123 | + assert metadata == {"end_of_log": True, "log_pos": 1} |
| 124 | + else: |
| 125 | + assert metadata == {"end_of_log": True, "first_time_read": False} |
123 | 126 | else:
|
124 | 127 | assert f"*** Found remote logs:\n*** * {expected_gs_uri}\n" in logs
|
125 | 128 | assert logs.endswith("CONTENT")
|
@@ -151,7 +154,10 @@ def test_should_read_from_local_on_logs_read_error(self, mock_blob, mock_client,
|
151 | 154 | f"{self.gcs_task_handler.local_base}/1.log",
|
152 | 155 | ]
|
153 | 156 | assert log[1].event == "::endgroup::"
|
154 |
| - assert metadata == {"end_of_log": True, "first_time_read": False} |
| 157 | + if AIRFLOW_V_3_0: |
| 158 | + assert metadata == {"end_of_log": True, "log_pos": 0} |
| 159 | + else: |
| 160 | + assert metadata == {"end_of_log": True, "first_time_read": False} |
155 | 161 | else:
|
156 | 162 | assert (
|
157 | 163 | "*** Found remote logs:\n"
|
|
0 commit comments