Update case: remove index name (#5969)

* remove indexname in test cases

Signed-off-by: zw <zw@milvus.io>

* remove indexname in test cases

Signed-off-by: zw <zw@milvus.io>

* Update index case

Signed-off-by: zw <zw@milvus.io>

Co-authored-by: zw <zw@milvus.io>
pull/6025/head^2
del-zhenwu 2021-06-23 16:50:07 +08:00 committed by GitHub
parent a1145ad7be
commit 7d319674ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 61 deletions

View File

@ -34,13 +34,6 @@ class TestIndexParams(TestcaseBase):
def get_invalid_field_name(self, request):
yield request.param
@pytest.fixture(
scope="function",
params=ct.get_invalid_strs
)
def get_invalid_index_name(self, request):
yield request.param
@pytest.fixture(
scope="function",
params=ct.get_invalid_strs
@ -60,16 +53,6 @@ class TestIndexParams(TestcaseBase):
def get_invalid_index_params(self, request):
yield request.param
# TODO: construct valid index params for all index types
@pytest.fixture(
scope="function",
params=[
default_index_params,
]
)
def get_valid_index_params(self, request):
yield request.param
# @pytest.mark.xfail(reason="issue #5646")
@pytest.mark.tags(CaseLabel.L1)
def test_index_collection_None(self):
@ -79,9 +62,8 @@ class TestIndexParams(TestcaseBase):
expected: raise exception
"""
self._connect()
index_name = cf.gen_unique_str(prefix)
self.index_wrap.init_index(None, default_field_name, default_index_params, name=index_name, check_task=CheckTasks.err_res,
err_code=1, err_msg="Collection")
self.index_wrap.init_index(None, default_field_name, default_index_params, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": "Collection"})
@pytest.mark.tags(CaseLabel.L1)
def test_index_field_name_invalid(self, get_invalid_field_name):
@ -91,11 +73,10 @@ class TestIndexParams(TestcaseBase):
expected: raise exception
"""
f_name = get_invalid_field_name
index_name = cf.gen_unique_str(prefix)
c_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
self.index_wrap.init_index(collection_w.collection, f_name, default_index_params, name=index_name, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": "must be str"})
self.index_wrap.init_index(collection_w.collection, f_name, default_index_params, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": "but expected one of"})
@pytest.mark.tags(CaseLabel.L1)
def test_index_field_name_not_existed(self):
@ -106,9 +87,8 @@ class TestIndexParams(TestcaseBase):
"""
c_name = cf.gen_unique_str(prefix)
f_name = cf.gen_unique_str(prefix)
index_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
self.index_wrap.init_index(collection_w.collection, f_name, default_index_params, name=index_name, check_task=CheckTasks.err_res,
self.index_wrap.init_index(collection_w.collection, f_name, default_index_params, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": "CreateIndex failed"})
@pytest.mark.tags(CaseLabel.L1)
@ -119,12 +99,15 @@ class TestIndexParams(TestcaseBase):
expected: raise exception
"""
c_name = cf.gen_unique_str(prefix)
index_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
index_params = copy.deepcopy(default_index_params)
index_params["index_type"] = get_invalid_index_type
self.index_wrap.init_index(collection_w.collection, default_field_name, index_params, name=index_name, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": "must be str"})
if not isinstance(index_params["index_type"], str):
msg = "must be str"
else:
msg = "Invalid index_type"
self.index_wrap.init_index(collection_w.collection, default_field_name, index_params, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": msg})
@pytest.mark.tags(CaseLabel.L1)
def test_index_type_not_supported(self):
@ -134,14 +117,12 @@ class TestIndexParams(TestcaseBase):
expected: raise exception
"""
c_name = cf.gen_unique_str(prefix)
index_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
index_params = copy.deepcopy(default_index_params)
index_params["index_type"] = "IVFFFFFFF"
self.index_wrap.init_index(collection_w.collection, default_field_name, index_params, name=index_name, check_task=CheckTasks.err_res,
self.index_wrap.init_index(collection_w.collection, default_field_name, index_params, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": ""})
@pytest.mark.xfail(reason="issue #5653")
@pytest.mark.tags(CaseLabel.L1)
def test_index_params_invalid(self, get_invalid_index_params):
"""
@ -150,10 +131,9 @@ class TestIndexParams(TestcaseBase):
expected: raise exception
"""
c_name = cf.gen_unique_str(prefix)
index_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
index_params = get_invalid_index_params
self.index_wrap.init_index(collection_w.collection, default_field_name, index_params, name=index_name, check_task=CheckTasks.err_res,
self.index_wrap.init_index(collection_w.collection, default_field_name, index_params, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": ""})
# TODO: not supported
@ -167,12 +147,22 @@ class TestIndexParams(TestcaseBase):
c_name = cf.gen_unique_str(prefix)
index_name = get_invalid_index_name
collection_w = self.init_collection_wrap(name=c_name)
self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params, name=index_name, check_task=CheckTasks.err_res,
self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": ""})
class TestIndexBase(TestcaseBase):
""" Test case of index interface """
# TODO: construct valid index params for all index types
@pytest.fixture(
scope="function",
params=[
default_index_params,
]
)
def get_valid_index_params(self, request):
yield request.param
@pytest.mark.tags(CaseLabel.L1)
def test_index_collection_empty(self):
@ -182,9 +172,8 @@ class TestIndexBase(TestcaseBase):
expected: no exception raised
"""
c_name = cf.gen_unique_str(prefix)
index_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
index, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params, name=index_name)
index, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params)
# TODO: assert index
cf.assert_equal_index(index, collection_w.collection.indexes[0])
@ -196,13 +185,31 @@ class TestIndexBase(TestcaseBase):
expected: no exception raised
"""
c_name = cf.gen_unique_str(prefix)
index_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
data = cf.gen_default_list_data(ct.default_nb)
collection_w.insert(data=data)
index_params = get_valid_index_params
index, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, index_params, name=index_name)
index, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, index_params)
# TODO: assert index
cf.assert_equal_index(index, collection_w.collection.indexes[0])
@pytest.mark.tags(CaseLabel.L1)
def test_index_params_flush(self):
"""
target: test index with all index type/params
method: input valid params
expected: no exception raised
"""
c_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
data = cf.gen_default_list_data(ct.default_nb)
collection_w.insert(data=data)
self._connect().flush([collection_w.name])
index, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params)
# TODO: assert index
cf.assert_equal_index(index, collection_w.collection.indexes[0])
assert collection_w.num_entities == ct.default_nb
# TODO: not support
@pytest.mark.tags(CaseLabel.L1)
def _test_index_name_dup(self):
@ -215,7 +222,7 @@ class TestIndexBase(TestcaseBase):
index_name = ct.default_index_name
collection_w = self.init_collection_wrap(name=c_name)
collection_w.collection.create_index(default_field_name, default_index_params, index_name=index_name)
self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params, name=index_name, check_task=CheckTasks.err_res,
self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params, check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": ""})
# TODO: server not supported
@ -268,20 +275,6 @@ class TestIndexBase(TestcaseBase):
"""
pass
# TODO: server not supported
@pytest.mark.tags(CaseLabel.L1)
def test_index_concurrently(self):
"""
target: test index concurrently, on one field
method: create index with different indexes with multi threads
expected: no exception raised
"""
c_name = cf.gen_unique_str(prefix)
index_name = cf.gen_unique_str(prefix)
collection_w = self.init_collection_wrap(name=c_name)
ex, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params, name=index_name)
assert "dup" in str(ex)
@pytest.mark.tags(CaseLabel.L1)
def test_index_drop(self):
"""
@ -290,9 +283,8 @@ class TestIndexBase(TestcaseBase):
expected: no exception raised
"""
c_name = cf.gen_unique_str(prefix)
index_name = ct.default_index_name
collection_w = self.init_collection_wrap(name=c_name)
index, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params, name=index_name)
index, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params)
cf.assert_equal_index(index, collection_w.collection.indexes[0])
self.index_wrap.drop()
assert len(collection_w.collection.indexes) == 0
@ -305,9 +297,8 @@ class TestIndexBase(TestcaseBase):
expected: exception raised
"""
c_name = cf.gen_unique_str(prefix)
index_name = ct.default_index_name
collection_w = self.init_collection_wrap(name=c_name)
_, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params, name=index_name)
_, _ = self.index_wrap.init_index(collection_w.collection, default_field_name, default_index_params)
self.index_wrap.drop()
self.index_wrap.drop(check_task=CheckTasks.err_res,
check_items={"err_code": 1, "err_msg": "Index doesn't exist"})
@ -326,12 +317,11 @@ class TestIndexAdvanced(TestcaseBase):
"""
c_name = cf.gen_unique_str(prefix)
c_name_2 = cf.gen_unique_str(prefix)
index_name = ct.default_index_name
cw = self.init_collection_wrap(name=c_name)
cw2 = self.init_collection_wrap(name=c_name_2)
iw_2 = ApiIndexWrapper()
self.index_wrap.init_index(cw.collection, default_field_name, default_index_params, name=index_name)
index_2, _ = iw_2.init_index(cw2.collection, default_field_name, default_index_params, name=index_name)
self.index_wrap.init_index(cw.collection, default_field_name, default_index_params)
index_2, _ = iw_2.init_index(cw2.collection, default_field_name, default_index_params)
self.index_wrap.drop()
assert cf.assert_equal_index(index_2, cw2.collection.indexes[0])
assert len(cw.collection.indexes) == 0

View File

@ -130,7 +130,7 @@ class TestUtilityParams(TestcaseBase):
assert "invalid" or "illegal" in str(ex)
@pytest.mark.tags(CaseLabel.L1)
def test_wait_index_invalid_index_name(self, get_invalid_index_name):
def _test_wait_index_invalid_index_name(self, get_invalid_index_name):
"""
target: test wait_index
method: input invalid index name