Skip to content

Commit 94f8f72

Browse files
sdks/python: mark milvus itests with require_docker_in_docker
1 parent adb3cc6 commit 94f8f72

File tree

1 file changed

+26
-30
lines changed

1 file changed

+26
-30
lines changed

sdks/python/apache_beam/ml/rag/enrichment/milvus_search_it_test.py

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,6 @@
3434

3535
import pytest
3636
import yaml
37-
from pymilvus import CollectionSchema
38-
from pymilvus import DataType
39-
from pymilvus import FieldSchema
40-
from pymilvus import Function
41-
from pymilvus import FunctionType
42-
from pymilvus import MilvusClient
43-
from pymilvus import RRFRanker
44-
from pymilvus.milvus_client import IndexParams
45-
from testcontainers.core.config import MAX_TRIES as TC_MAX_TRIES
46-
from testcontainers.core.config import testcontainers_config
47-
from testcontainers.core.generic import DbContainer
48-
from testcontainers.milvus import MilvusContainer
4937

5038
import apache_beam as beam
5139
from apache_beam.ml.rag.types import Chunk
@@ -54,7 +42,21 @@
5442
from apache_beam.testing.test_pipeline import TestPipeline
5543
from apache_beam.testing.util import assert_that
5644

45+
# pylint: disable=ungrouped-imports
5746
try:
47+
from pymilvus import (
48+
CollectionSchema,
49+
DataType,
50+
FieldSchema,
51+
Function,
52+
FunctionType,
53+
MilvusClient,
54+
RRFRanker)
55+
from pymilvus.milvus_client import IndexParams
56+
from testcontainers.core.config import MAX_TRIES as TC_MAX_TRIES
57+
from testcontainers.core.config import testcontainers_config
58+
from testcontainers.core.generic import DbContainer
59+
from testcontainers.milvus import MilvusContainer
5860
from apache_beam.transforms.enrichment import Enrichment
5961
from apache_beam.ml.rag.enrichment.milvus_search import (
6062
MilvusSearchEnrichmentHandler,
@@ -467,7 +469,7 @@ def create_user_yaml(service_port: int, max_vector_field_num=5):
467469
os.remove(path)
468470

469471

470-
@pytest.mark.uses_testcontainer
472+
@pytest.mark.require_docker_in_docker
471473
@unittest.skipUnless(
472474
platform.system() == "Linux",
473475
"Test runs only on Linux due to lack of support, as yet, for nested "
@@ -483,22 +485,16 @@ class TestMilvusSearchEnrichment(unittest.TestCase):
483485

484486
@classmethod
485487
def setUpClass(cls):
486-
try:
487-
cls._db = MilvusEnrichmentTestHelper.start_db_container(
488-
cls._version, vector_client_max_retries=1, tc_max_retries=1)
489-
cls._connection_params = MilvusConnectionParameters(
490-
uri=cls._db.uri,
491-
user=cls._db.user,
492-
password=cls._db.password,
493-
db_id=cls._db.id,
494-
token=cls._db.token)
495-
cls._collection_load_params = MilvusCollectionLoadParameters()
496-
cls._collection_name = MilvusEnrichmentTestHelper.initialize_db_with_data(
497-
cls._connection_params)
498-
except Exception as e:
499-
pytest.skip(
500-
f"Skipping all tests in {cls.__name__} due to DB startup failure: {e}"
501-
)
488+
cls._db = MilvusEnrichmentTestHelper.start_db_container(cls._version)
489+
cls._connection_params = MilvusConnectionParameters(
490+
uri=cls._db.uri,
491+
user=cls._db.user,
492+
password=cls._db.password,
493+
db_id=cls._db.id,
494+
token=cls._db.token)
495+
cls._collection_load_params = MilvusCollectionLoadParameters()
496+
cls._collection_name = MilvusEnrichmentTestHelper.initialize_db_with_data(
497+
cls._connection_params)
502498

503499
@classmethod
504500
def tearDownClass(cls):
@@ -1368,4 +1364,4 @@ def assert_chunks_equivalent(
13681364

13691365

13701366
if __name__ == '__main__':
1371-
unittest.main()
1367+
unittest.main()

0 commit comments

Comments
 (0)