This is an automated email from the ASF dual-hosted git repository.
weilee 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 5a47968401 Fix failing canary build (#42431)
5a47968401 is described below
commit 5a47968401446c4e916a9dac5cdaaddcbf7e306b
Author: Owen Leung <[email protected]>
AuthorDate: Tue Sep 24 15:26:03 2024 +0800
Fix failing canary build (#42431)
* Skip opensearch unittest when opensearchpy is not available
---
pyproject.toml | 3 +++
tests/providers/opensearch/conftest.py | 2 +-
tests/providers/opensearch/log/test_os_json_formatter.py | 2 ++
tests/providers/opensearch/log/test_os_response.py | 2 ++
tests/providers/opensearch/log/test_os_task_handler.py | 9 ++-------
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index dff78de576..eba9f7225a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -415,6 +415,9 @@ combine-as-imports = true
"tests/providers/openai/triggers/test_openai.py" = ["E402"]
"tests/providers/opensearch/conftest.py" = ["E402"]
"tests/providers/opensearch/hooks/test_opensearch.py" = ["E402"]
+"tests/providers/opensearch/log/test_os_json_formatter.py" = ["E402"]
+"tests/providers/opensearch/log/test_os_response.py" = ["E402"]
+"tests/providers/opensearch/log/test_os_task_handler.py" = ["E402"]
"tests/providers/opensearch/operators/test_opensearch.py" = ["E402"]
"tests/providers/qdrant/hooks/test_qdrant.py" = ["E402"]
"tests/providers/qdrant/operators/test_qdrant.py" = ["E402"]
diff --git a/tests/providers/opensearch/conftest.py
b/tests/providers/opensearch/conftest.py
index 35291b0d6e..8edb688068 100644
--- a/tests/providers/opensearch/conftest.py
+++ b/tests/providers/opensearch/conftest.py
@@ -50,7 +50,7 @@ class MockSearch(OpenSearchHook):
return doc_id
-class MockClient(OpenSearch):
+class MockClient:
def count(self, index: Any = None, body: Any = None):
return {"count": 1, "_shards": {"total": 1, "successful": 1,
"skipped": 0, "failed": 0}}
diff --git a/tests/providers/opensearch/log/test_os_json_formatter.py
b/tests/providers/opensearch/log/test_os_json_formatter.py
index 27cf2be211..bae039e199 100644
--- a/tests/providers/opensearch/log/test_os_json_formatter.py
+++ b/tests/providers/opensearch/log/test_os_json_formatter.py
@@ -24,6 +24,8 @@ import logging
import pendulum
import pytest
+opensearchpy = pytest.importorskip("opensearchpy")
+
from airflow.providers.opensearch.log.os_task_handler import (
OpensearchJSONFormatter,
)
diff --git a/tests/providers/opensearch/log/test_os_response.py
b/tests/providers/opensearch/log/test_os_response.py
index d4c1858d37..5b2f36d3c2 100644
--- a/tests/providers/opensearch/log/test_os_response.py
+++ b/tests/providers/opensearch/log/test_os_response.py
@@ -22,6 +22,8 @@ from typing import Any
import pytest
+opensearchpy = pytest.importorskip("opensearchpy")
+
from airflow.providers.opensearch.log.os_response import (
AttributeList,
Hit,
diff --git a/tests/providers/opensearch/log/test_os_task_handler.py
b/tests/providers/opensearch/log/test_os_task_handler.py
index 27f2ac7728..d23249ba9e 100644
--- a/tests/providers/opensearch/log/test_os_task_handler.py
+++ b/tests/providers/opensearch/log/test_os_task_handler.py
@@ -29,7 +29,8 @@ from unittest.mock import Mock, patch
import pendulum
import pytest
-from opensearchpy import OpenSearch
+
+opensearchpy = pytest.importorskip("opensearchpy")
from opensearchpy.exceptions import NotFoundError
from airflow.configuration import conf
@@ -112,11 +113,6 @@ class TestOpensearchTaskHandler:
)
self.os_task_handler.client = MockClient()
- # self.index_name = "test_index"
- # self.doc_type = "log"
- # self.test_message = "some random stuff"
- # self.body = {"message": self.test_message, "log_id": self.LOG_ID,
"offset": 1}
- # self.os.index(index=self.index_name, doc_type=self.doc_type,
body=self.body, id=1)
def teardown_method(self):
shutil.rmtree(self.local_log_location.split(os.path.sep)[0],
ignore_errors=True)
@@ -141,7 +137,6 @@ class TestOpensearchTaskHandler:
)
def test_client(self):
- assert issubclass(type(self.os_task_handler.client), OpenSearch)
assert self.os_task_handler.index_patterns == "_all"
def test_client_with_config(self):
