From c4cb6f4bbd2aa37b229ac8cb62e00fe5c755a5a2 Mon Sep 17 00:00:00 2001 From: del-zhenwu <56623710+del-zhenwu@users.noreply.github.com> Date: Mon, 10 Aug 2020 17:53:24 +0800 Subject: [PATCH] [skip ci] use pymilvus-test, remove personal git repo (#3194) * [skip ci] use pymilvus-test, remove personal git repo Signed-off-by: zw * [skip ci] add pytest dry-run Signed-off-by: zw Co-authored-by: zw Co-authored-by: Jin Hai --- ci/jenkins/step/singleDevTest.groovy | 4 +--- tests/milvus_python_test/README.md | 9 +++++++++ tests/milvus_python_test/conftest.py | 10 ++++++++++ tests/milvus_python_test/requirements.txt | 1 + 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/step/singleDevTest.groovy b/ci/jenkins/step/singleDevTest.groovy index b4dbfc44..b256a4dd 100644 --- a/ci/jenkins/step/singleDevTest.groovy +++ b/ci/jenkins/step/singleDevTest.groovy @@ -22,9 +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_no_pymilvus.txt' - sh 'python3 -m pip install git+https://github.com/BossZou/pymilvus.git@api-update' + sh 'python3 -m pip install -r requirements.txt -i http://pypi.douban.com/simple --trusted-host pypi.douban.com' sh "pytest . --alluredir=\"test_out/dev/single/mysql\" --level=1 --ip ${env.HELM_RELEASE_NAME}.milvus.svc.cluster.local --service ${env.HELM_RELEASE_NAME} >> ${WORKSPACE}/${env.DEV_TEST_ARTIFACTS}/milvus_${BINARY_VERSION}_mysql_dev_test.log" // 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}" } diff --git a/tests/milvus_python_test/README.md b/tests/milvus_python_test/README.md index 6a87bf1f..6cb24dd8 100644 --- a/tests/milvus_python_test/README.md +++ b/tests/milvus_python_test/README.md @@ -12,6 +12,15 @@ or test connect function only pytest test_connect.py --level=1 ``` +collect cases +```shell +pytest --day-run -qq +``` +collect cases with docstring +```shell +pytest --collect-only -qq +``` + with allure test report ```shell diff --git a/tests/milvus_python_test/conftest.py b/tests/milvus_python_test/conftest.py index dfc0a662..ea0b7be1 100644 --- a/tests/milvus_python_test/conftest.py +++ b/tests/milvus_python_test/conftest.py @@ -18,6 +18,7 @@ def pytest_addoption(parser): parser.addoption("--http-port", action="store", default=19121) parser.addoption("--handler", action="store", default="GRPC") parser.addoption("--tag", action="store", default="all", help="only run tests matching the tag.") + parser.addoption('--dry-run', action='store_true', default=False) def pytest_configure(config): @@ -38,6 +39,13 @@ def pytest_runtest_setup(item): pytest.skip("test requires tag in {!r}".format(tags)) +def pytest_runtestloop(session): + if session.config.getoption('--dry-run'): + for item in session.items: + print(item.nodeid) + return True + + def check_server_connection(request): ip = request.config.getoption("--ip") port = request.config.getoption("--port") @@ -132,6 +140,7 @@ def collection(request, connect): return collection_name +# customised id @pytest.fixture(scope="function") def id_collection(request, connect): ori_collection_name = getattr(request.module, "collection_id", "test") @@ -168,6 +177,7 @@ def binary_collection(request, connect): return collection_name +# customised id @pytest.fixture(scope="function") def binary_id_collection(request, connect): ori_collection_name = getattr(request.module, "collection_id", "test") diff --git a/tests/milvus_python_test/requirements.txt b/tests/milvus_python_test/requirements.txt index a2868e30..5187184a 100644 --- a/tests/milvus_python_test/requirements.txt +++ b/tests/milvus_python_test/requirements.txt @@ -9,3 +9,4 @@ pytest-level==0.1.1 pytest-xdist==1.23.2 scikit-learn>=0.19.1 kubernetes==10.0.1 +pymilvus-test>=0.4.5 \ No newline at end of file -- GitLab