This is an automated email from the ASF dual-hosted git repository.
potiuk 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 fda3fdac390 Clean up remaining DB-dependent tests from OpenSearch
provider (#52235)
fda3fdac390 is described below
commit fda3fdac39063113c6476346c9e1057471e683c5
Author: Kyungjun Lee <kyungjunlee...@gmail.com>
AuthorDate: Thu Jun 26 18:45:13 2025 +0900
Clean up remaining DB-dependent tests from OpenSearch provider (#52235)
* DEL: remove pytestmark
* DEL: remove pytestmark in os_response
* DEL: remove pytestmark in operator
* CHG: opensearch in .pre-commit-config.yaml and Mark DB-dependent tests in
test_os_task_handler with @pytest.mark.db_test
* CHORE: Enable db_test pre-commit check for OpenSearch hooks/operators
* DEL: check-pytest-mark-db-test-in-providers about opensearch in
pre-commit-config.yaml
---
.../tests/unit/opensearch/log/test_os_json_formatter.py | 1 -
.../tests/unit/opensearch/log/test_os_response.py | 1 -
.../tests/unit/opensearch/log/test_os_task_handler.py | 17 +++++++++++++++--
.../tests/unit/opensearch/operators/test_opensearch.py | 1 -
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git
a/providers/opensearch/tests/unit/opensearch/log/test_os_json_formatter.py
b/providers/opensearch/tests/unit/opensearch/log/test_os_json_formatter.py
index e85f02b56be..14700b44737 100644
--- a/providers/opensearch/tests/unit/opensearch/log/test_os_json_formatter.py
+++ b/providers/opensearch/tests/unit/opensearch/log/test_os_json_formatter.py
@@ -29,7 +29,6 @@ from airflow.providers.opensearch.log.os_task_handler import (
)
opensearchpy = pytest.importorskip("opensearchpy")
-pytestmark = pytest.mark.db_test
class TestOpensearchJSONFormatter:
diff --git a/providers/opensearch/tests/unit/opensearch/log/test_os_response.py
b/providers/opensearch/tests/unit/opensearch/log/test_os_response.py
index 31af433754f..f7f36b6732f 100644
--- a/providers/opensearch/tests/unit/opensearch/log/test_os_response.py
+++ b/providers/opensearch/tests/unit/opensearch/log/test_os_response.py
@@ -31,7 +31,6 @@ from airflow.providers.opensearch.log.os_response import (
from airflow.providers.opensearch.log.os_task_handler import
OpensearchTaskHandler
opensearchpy = pytest.importorskip("opensearchpy")
-pytestmark = pytest.mark.db_test
class TestHitAndHitMetaAndOpenSearchResponse:
diff --git
a/providers/opensearch/tests/unit/opensearch/log/test_os_task_handler.py
b/providers/opensearch/tests/unit/opensearch/log/test_os_task_handler.py
index ee90e3c6220..fb51c56e469 100644
--- a/providers/opensearch/tests/unit/opensearch/log/test_os_task_handler.py
+++ b/providers/opensearch/tests/unit/opensearch/log/test_os_task_handler.py
@@ -48,7 +48,6 @@ from tests_common.test_utils.version_compat import
AIRFLOW_V_3_0_PLUS
from unit.opensearch.conftest import MockClient
opensearchpy = pytest.importorskip("opensearchpy")
-pytestmark = pytest.mark.db_test
ES_PROVIDER_YAML_FILE = AIRFLOW_PROVIDERS_ROOT_PATH / "elasticsearch" /
"provider.yaml"
@@ -191,6 +190,7 @@ class TestOpensearchTaskHandler:
)
assert handler.index_patterns == patterns
+ @pytest.mark.db_test
def test_read(self, ti):
ts = pendulum.now()
logs, metadatas = self.os_task_handler.read(
@@ -220,6 +220,7 @@ class TestOpensearchTaskHandler:
assert not metadata["end_of_log"]
assert timezone.parse(metadata["last_log_timestamp"]) > ts
+ @pytest.mark.db_test
def test_read_with_patterns(self, ti):
ts = pendulum.now()
with mock.patch.object(self.os_task_handler, "index_patterns",
new="test_*,other_*"):
@@ -250,6 +251,7 @@ class TestOpensearchTaskHandler:
assert not metadata["end_of_log"]
assert timezone.parse(metadata["last_log_timestamp"]) > ts
+ @pytest.mark.db_test
def test_read_with_patterns_no_match(self, ti):
ts = pendulum.now()
with mock.patch.object(self.os_task_handler, "index_patterns",
new="test_other_*,test_another_*"):
@@ -284,6 +286,7 @@ class TestOpensearchTaskHandler:
# last_log_timestamp won't change if no log lines read.
assert timezone.parse(metadata["last_log_timestamp"]) == ts
+ @pytest.mark.db_test
def test_read_with_missing_index(self, ti):
ts = pendulum.now()
with mock.patch.object(self.os_task_handler, "index_patterns",
new="nonexistent,test_*"):
@@ -304,6 +307,7 @@ class TestOpensearchTaskHandler:
)
@pytest.mark.parametrize("seconds", [3, 6])
+ @pytest.mark.db_test
def test_read_missing_logs(self, seconds, create_task_instance):
"""
When the log actually isn't there to be found, we only want to wait
for 5 seconds.
@@ -359,6 +363,7 @@ class TestOpensearchTaskHandler:
assert metadatas[0]["offset"] == "0"
assert timezone.parse(metadatas[0]["last_log_timestamp"]) == ts
+ @pytest.mark.db_test
def test_read_with_none_metadata(self, ti):
logs, metadatas = self.os_task_handler.read(ti, 1)
@@ -386,10 +391,12 @@ class TestOpensearchTaskHandler:
assert not metadata["end_of_log"]
assert timezone.parse(metadata["last_log_timestamp"]) < pendulum.now()
+ @pytest.mark.db_test
def test_set_context(self, ti):
self.os_task_handler.set_context(ti)
assert self.os_task_handler.mark_end_on_close
+ @pytest.mark.db_test
def test_set_context_w_json_format_and_write_stdout(self, ti):
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s
- %(message)s")
self.os_task_handler.formatter = formatter
@@ -397,6 +404,7 @@ class TestOpensearchTaskHandler:
self.os_task_handler.json_format = True
self.os_task_handler.set_context(ti)
+ @pytest.mark.db_test
def test_close(self, ti):
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s
- %(message)s")
self.os_task_handler.formatter = formatter
@@ -413,6 +421,7 @@ class TestOpensearchTaskHandler:
assert log_line.endswith(self.end_of_log_mark.strip())
assert self.os_task_handler.closed
+ @pytest.mark.db_test
def test_close_no_mark_end(self, ti):
ti.raw = True
self.os_task_handler.set_context(ti)
@@ -423,6 +432,7 @@ class TestOpensearchTaskHandler:
assert self.end_of_log_mark not in log_file.read()
assert self.os_task_handler.closed
+ @pytest.mark.db_test
def test_close_closed(self, ti):
self.os_task_handler.closed = True
self.os_task_handler.set_context(ti)
@@ -432,6 +442,7 @@ class TestOpensearchTaskHandler:
) as log_file:
assert len(log_file.read()) == 0
+ @pytest.mark.db_test
def test_close_with_no_handler(self, ti):
self.os_task_handler.set_context(ti)
self.os_task_handler.handler = None
@@ -442,6 +453,7 @@ class TestOpensearchTaskHandler:
assert len(log_file.read()) == 0
assert self.os_task_handler.closed
+ @pytest.mark.db_test
def test_close_with_no_stream(self, ti):
self.os_task_handler.set_context(ti)
self.os_task_handler.handler.stream = None
@@ -461,18 +473,19 @@ class TestOpensearchTaskHandler:
assert self.end_of_log_mark in log_file.read()
assert self.os_task_handler.closed
+ @pytest.mark.db_test
def test_render_log_id(self, ti):
assert self.os_task_handler._render_log_id(ti, 1) == self.LOG_ID
self.os_task_handler.json_format = True
assert self.os_task_handler._render_log_id(ti, 1) == self.JSON_LOG_ID
- #
def test_clean_date(self):
clean_execution_date = self.os_task_handler._clean_date(datetime(2016,
7, 8, 9, 10, 11, 12))
assert clean_execution_date == "2016_07_08T09_10_11_000012"
@mock.patch("sys.__stdout__", new_callable=StringIO)
+ @pytest.mark.db_test
def test_dynamic_offset(self, stdout_mock, ti, time_machine):
# arrange
handler = OpensearchTaskHandler(
diff --git
a/providers/opensearch/tests/unit/opensearch/operators/test_opensearch.py
b/providers/opensearch/tests/unit/opensearch/operators/test_opensearch.py
index fd42a91a71d..02eb9c2d68e 100644
--- a/providers/opensearch/tests/unit/opensearch/operators/test_opensearch.py
+++ b/providers/opensearch/tests/unit/opensearch/operators/test_opensearch.py
@@ -28,7 +28,6 @@ from airflow.providers.opensearch.operators.opensearch import
(
from airflow.utils.timezone import datetime
opensearchpy = pytest.importorskip("opensearchpy")
-pytestmark = pytest.mark.db_test
TEST_DAG_ID = "unit_tests"
