From 98603cd91a501ba90066b5a2b40b3198993ff0b5 Mon Sep 17 00:00:00 2001 From: Han Xiao Date: Sat, 9 Jan 2021 10:50:26 +0100 Subject: [PATCH 1/3] ci: fix escape flag in codecov --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10d7ac453bb1d..f9049677d871e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,5 +151,5 @@ jobs: with: file: coverage.xml name: ${{ matrix.test-path }}-codecov - flags: ${{ matrix.test-path }}, core, ci, ${{ matrix.python-version }} + flags: core, ci, ${{ matrix.python-version }} fail_ci_if_error: false From 159004f850e45eae8aa4eb025bb094654000b46d Mon Sep 17 00:00:00 2001 From: Han Xiao Date: Sat, 9 Jan 2021 11:01:09 +0100 Subject: [PATCH 2/3] fix(indexer): fix indexer keys assert --- tests/conftest.py | 16 ++++++++++++++-- tests/jinad/integration/distributed/conftest.py | 15 --------------- 2 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 tests/jinad/integration/distributed/conftest.py diff --git a/tests/conftest.py b/tests/conftest.py index a4d35b0851189..070b66dadf71a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,11 +1,11 @@ import os import random import string +import time import pytest -from fastapi.testclient import TestClient - from daemon.config import fastapi_config +from fastapi.testclient import TestClient from jina.executors.metas import get_default_metas PREFIX = fastapi_config.PREFIX @@ -74,3 +74,15 @@ def pea_endpoints(): ('_create', f'{PREFIX}/pea'), ('_delete', f'{PREFIX}/pea') ] + + +@pytest.fixture() +def docker_compose(request): + os.system( + f"docker-compose -f {request.param} --project-directory . up --build -d --remove-orphans" + ) + time.sleep(10) + yield + os.system( + f"docker-compose -f {request.param} --project-directory . down --remove-orphans" + ) diff --git a/tests/jinad/integration/distributed/conftest.py b/tests/jinad/integration/distributed/conftest.py deleted file mode 100644 index 07f3d73842131..0000000000000 --- a/tests/jinad/integration/distributed/conftest.py +++ /dev/null @@ -1,15 +0,0 @@ -import os -import time -import pytest - - -@pytest.fixture() -def docker_compose(request): - os.system( - f"docker-compose -f {request.param} --project-directory . up --build -d --remove-orphans" - ) - time.sleep(10) - yield - os.system( - f"docker-compose -f {request.param} --project-directory . down --remove-orphans" - ) From e2f401cbdf97f94e4df2dd39aa29871c567e8306 Mon Sep 17 00:00:00 2001 From: Han Xiao Date: Sat, 9 Jan 2021 11:03:53 +0100 Subject: [PATCH 3/3] fix(indexer): fix indexer keys assert --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9049677d871e..5279a7b4add8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,5 +151,5 @@ jobs: with: file: coverage.xml name: ${{ matrix.test-path }}-codecov - flags: core, ci, ${{ matrix.python-version }} + flags: core, ci fail_ci_if_error: false