From ac972a64a6c11047fdaf4fb36df2cd0f068edb30 Mon Sep 17 00:00:00 2001 From: ThreadDao Date: Mon, 4 Oct 2021 20:16:01 +0800 Subject: [PATCH] [skip ci] Reformat conftest file (#9226) Signed-off-by: ThreadDao --- tests/python_client/conftest.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/python_client/conftest.py b/tests/python_client/conftest.py index c5cc6618de..c7f0ee63be 100644 --- a/tests/python_client/conftest.py +++ b/tests/python_client/conftest.py @@ -10,8 +10,6 @@ from check.param_check import ip_check, number_check from config.log_config import log_config from utils.utils import * - - timeout = 60 dimension = 128 delete_timeout = 60 @@ -40,7 +38,6 @@ def pytest_addoption(parser): parser.addoption('--field_name', action='store', default="field_name", help="field_name of index") - @pytest.fixture def host(request): return request.config.getoption("--host") @@ -207,6 +204,7 @@ def get_invalid_partition_name(request): def get_invalid_vector_dict(request): yield request.param + def pytest_configure(config): # register an additional marker config.addinivalue_line( @@ -303,12 +301,14 @@ def connect(request): except Exception as e: logging.getLogger().error(str(e)) pytest.exit("Milvus server can not connected, exit pytest ...") + def fin(): try: milvus.close() pass except Exception as e: logging.getLogger().info(str(e)) + request.addfinalizer(fin) return milvus @@ -360,9 +360,11 @@ def collection(request, connect): connect.create_collection(collection_name, default_fields) except Exception as e: pytest.exit(str(e)) + def teardown(): if connect.has_collection(collection_name): connect.drop_collection(collection_name, timeout=delete_timeout) + request.addfinalizer(teardown) assert connect.has_collection(collection_name) return collection_name @@ -378,9 +380,11 @@ def id_collection(request, connect): connect.create_collection(collection_name, fields) except Exception as e: pytest.exit(str(e)) + def teardown(): if connect.has_collection(collection_name): connect.drop_collection(collection_name, timeout=delete_timeout) + request.addfinalizer(teardown) assert connect.has_collection(collection_name) return collection_name @@ -395,10 +399,12 @@ def binary_collection(request, connect): connect.create_collection(collection_name, fields) except Exception as e: pytest.exit(str(e)) + def teardown(): collection_names = connect.list_collections() if connect.has_collection(collection_name): connect.drop_collection(collection_name, timeout=delete_timeout) + request.addfinalizer(teardown) assert connect.has_collection(collection_name) return collection_name @@ -414,9 +420,11 @@ def binary_id_collection(request, connect): connect.create_collection(collection_name, fields) except Exception as e: pytest.exit(str(e)) + def teardown(): if connect.has_collection(collection_name): connect.drop_collection(collection_name, timeout=delete_timeout) + request.addfinalizer(teardown) assert connect.has_collection(collection_name) return collection_name @@ -429,4 +437,4 @@ def binary_id_collection(request, connect): # if report.outcome == "failed": # msg = "The execution of the test case fails and the test exits..." # log.error(msg) -# pytest.exit(msg) \ No newline at end of file +# pytest.exit(msg)