Commit 2b26468c authored by del-zhenwu's avatar del-zhenwu Committed by JinHai-CN
Browse files

test level 3: restart (#2384) 



* test level 3: restart

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

* add namepsace

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

* update

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

* update

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

* Update utils.py

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

* Update test_level_3.py

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

* Update Jenkinsfile

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

* debug

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

* debug

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

* debug

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

* debug

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

* clean compile warning (#2380)

Signed-off-by: default avataryudong.cai <yudong.cai@zilliz.com>
Signed-off-by: default avatarzw <zw@milvus.io>

* delete pod

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

* update

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

* debug

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

* debug

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

* recover

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

Co-authored-by: default avatarzw <zw@milvus.io>
Co-authored-by: default avatarCai Yudong <yudong.cai@zilliz.com>
parent 086efd62

ci/jenkins/step/singleDevTest.groovy

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ timeout(time: 120, unit: 'MINUTES') { 
        checkout([$class: 'GitSCM', branches: [[name: "${env.HELM_BRANCH}"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/${env.HELM_BRANCH}:refs/remotes/origin/${env.HELM_BRANCH}"]]])

        retry(3) {

            try {

                sh "helm install --wait --timeout 300s --set image.repository=registry.zilliz.com/milvus/engine --set image.tag=${DOCKER_VERSION} --set image.pullPolicy=Always --set service.type=ClusterIP -f ci/db_backend/mysql_${BINARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ${env.HELM_RELEASE_NAME} ."

                sh "helm install --wait --timeout 300s --set image.repository=registry.zilliz.com/milvus/engine --set persistence.enabled=true --set image.tag=${DOCKER_VERSION} --set image.pullPolicy=Always --set service.type=ClusterIP -f ci/db_backend/mysql_${BINARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ${env.HELM_RELEASE_NAME} ."

            } catch (exc) {

                def helmStatusCMD = "helm get manifest --namespace milvus ${env.HELM_RELEASE_NAME} | kubectl describe -n milvus -f - && \

                                     kubectl logs --namespace milvus -l \"app=milvus,release=${env.HELM_RELEASE_NAME}\" -c milvus && \
@@ -22,6 +22,7 @@ timeout(time: 120, unit: 'MINUTES') { 
    dir ("tests/milvus_python_test") {

        // sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com'

        sh 'python3 -m pip install -r requirements.txt'

        sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --level=1 --ip ${env.HELM_RELEASE_NAME}.milvus.svc.cluster.local"

        sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --level=1 --ip ${env.HELM_RELEASE_NAME}.milvus.svc.cluster.local --service ${env.HELM_RELEASE_NAME}"

        // sh "pytest test_restart.py --alluredir=\"test_out/dev/single/mysql\" --level=3 --ip ${env.HELM_RELEASE_NAME}.milvus.svc.cluster.local --service ${env.HELM_RELEASE_NAME}"

    }

}

tests/milvus_python_test/test_collection.py→tests/milvus_python_test/collection/test_collection.py

+6 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,7 @@ class TestCollectionLogic(object): 
            self.execute(logic_seq, connect)

        else:

            self.execute_with_error(logic_seq, connect)

        self.tear_down(connect)



    def is_right(self, seq):

        if sorted(seq) == seq:
@@ -1089,6 +1090,11 @@ class TestCollectionLogic(object): 
                break

        assert error_flag == True



    def tear_down(self, connect):

        names = connect.list_collections()[1]

        for name in names:

            connect.drop_collection(name)



    def gen_params(self):

        collection_name = gen_unique_str("test_collection")

        top_k = 1

tests/milvus_python_test/conftest.py

+34 −30
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ timeout = 1 


def pytest_addoption(parser):

    parser.addoption("--ip", action="store", default="localhost")

    parser.addoption("--service", action="store", default="")

    parser.addoption("--port", action="store", default=19530)

    parser.addoption("--http-port", action="store", default=19121)

    parser.addoption("--handler", action="store", default="GRPC")
@@ -35,6 +36,7 @@ def check_server_connection(request): 
@pytest.fixture(scope="module")

def connect(request):

    ip = request.config.getoption("--ip")

    service_name = request.config.getoption("--service")

    port = request.config.getoption("--port")

    http_port = request.config.getoption("--http-port")

    handler = request.config.getoption("--handler")
@@ -47,7 +49,7 @@ def connect(request): 
        pytest.exit("Milvus server can not connected, exit pytest ...")

    def fin():

        try:

            # milvus.disconnect()

            milvus.close()

            pass

        except Exception as e:

            logging.getLogger().info(str(e))
@@ -58,6 +60,7 @@ def connect(request): 
@pytest.fixture(scope="module")

def dis_connect(request):

    ip = request.config.getoption("--ip")

    service_name = request.config.getoption("--service")

    port = request.config.getoption("--port")

    http_port = request.config.getoption("--http-port")

    handler = request.config.getoption("--handler")
@@ -71,12 +74,13 @@ def dis_connect(request): 
@pytest.fixture(scope="module")

def args(request):

    ip = request.config.getoption("--ip")

    service_name = request.config.getoption("--service")

    port = request.config.getoption("--port")

    http_port = request.config.getoption("--http-port")

    handler = request.config.getoption("--handler")

    if handler == "HTTP":

        port = http_port

    args = {"ip": ip, "port": port, "handler": handler}

    args = {"ip": ip, "port": port, "handler": handler, "service_name": service_name}

    return args
@@ -108,10 +112,10 @@ def collection(request, connect): 
        pytest.exit("collection can not be created, exit pytest ...")



    def teardown():

        # status, collection_names = connect.list_collections()

        # for collection_name in collection_names:

        #     connect.drop_collection(collection_name)

        status, collection_names = connect.list_collections()

        for collection_name in collection_names:

            connect.drop_collection(collection_name)

        # connect.drop_collection(collection_name)



    request.addfinalizer(teardown)
@@ -135,10 +139,10 @@ def ip_collection(request, connect): 
        pytest.exit("collection can not be created, exit pytest ...")



    def teardown():

        # status, collection_names = connect.list_collections()

        # for collection_name in collection_names:

        #     connect.drop_collection(collection_name)

        status, collection_names = connect.list_collections()

        for collection_name in collection_names:

            connect.drop_collection(collection_name)

        # connect.drop_collection(collection_name)



    request.addfinalizer(teardown)
@@ -162,10 +166,10 @@ def jac_collection(request, connect): 
        pytest.exit("collection can not be created, exit pytest ...")



    def teardown():

        # status, collection_names = connect.list_collections()

        # for collection_name in collection_names:

        #     connect.drop_collection(collection_name)

        status, collection_names = connect.list_collections()

        for collection_name in collection_names:

            connect.drop_collection(collection_name)

        # connect.drop_collection(collection_name)



    request.addfinalizer(teardown)
@@ -188,10 +192,10 @@ def ham_collection(request, connect): 
        pytest.exit("collection can not be created, exit pytest ...")



    def teardown():

        # status, collection_names = connect.list_collections()

        # for collection_name in collection_names:

        #     connect.drop_collection(collection_name)

        status, collection_names = connect.list_collections()

        for collection_name in collection_names:

            connect.drop_collection(collection_name)

        # connect.drop_collection(collection_name)



    request.addfinalizer(teardown)
@@ -214,10 +218,10 @@ def tanimoto_collection(request, connect): 
        pytest.exit("collection can not be created, exit pytest ...")



    def teardown():

        # status, collection_names = connect.list_collections()

        # for collection_name in collection_names:

        #     connect.drop_collection(collection_name)

        status, collection_names = connect.list_collections()

        for collection_name in collection_names:

            connect.drop_collection(collection_name)

        # connect.drop_collection(collection_name)



    request.addfinalizer(teardown)

    return collection_name
@@ -239,10 +243,10 @@ def substructure_collection(request, connect): 
        pytest.exit("collection can not be created, exit pytest ...")



    def teardown():

        # status, collection_names = connect.list_collections()

        # for collection_name in collection_names:

        #     connect.drop_collection(collection_name)

        status, collection_names = connect.list_collections()

        for collection_name in collection_names:

            connect.drop_collection(collection_name)

        # connect.drop_collection(collection_name)



    request.addfinalizer(teardown)

    return collection_name
@@ -264,10 +268,10 @@ def superstructure_collection(request, connect): 
        pytest.exit("collection can not be created, exit pytest ...")



    def teardown():

        # status, collection_names = connect.list_collections()

        # for collection_name in collection_names:

        #     connect.drop_collection(collection_name)

        status, collection_names = connect.list_collections()

        for collection_name in collection_names:

            connect.drop_collection(collection_name)

        # connect.drop_collection(collection_name)



    request.addfinalizer(teardown)

    return collection_name