Merge branch 'master' of github.com:jina-ai/jina into refactor-reques…

…t-size
jina-ai · Jan 13, 2021 · 3b62d19 · 3b62d19
2 parents c27a9e3 + bfef4f0
commit 3b62d19
Show file tree

Hide file tree

Showing 75 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -90,7 +90,7 @@ jobs:
           dockerfile: Dockerfiles/pip.Dockerfile
           buildargs: PIP_TAG
           buildoptions: ${{ matrix.build_option }}
-          tags: "test-pip"
+          tags: test-pip${{env.GITHUB_RUN_ID}}
       - id: set-matrix
         run: |
           sudo apt-get install jq
@@ -104,8 +104,8 @@ jobs:
     steps:
       - run: |
           docker login docker.pkg.github.com -u $GITHUB_ACTOR -p $GITHUB_TOKEN
-          docker pull docker.pkg.github.com/jina-ai/jina/jina:test-pip
-          docker run docker.pkg.github.com/jina-ai/jina/jina:test-pip hello-world
+          docker pull docker.pkg.github.com/jina-ai/jina/jina:test-pip${{env.GITHUB_RUN_ID}}
+          docker run docker.pkg.github.com/jina-ai/jina/jina:test-pip${{env.GITHUB_RUN_ID}} hello-world
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
@@ -127,8 +127,8 @@ jobs:
       - name: Prepare enviroment
         run: |
           docker login docker.pkg.github.com -u $GITHUB_ACTOR -p $GITHUB_TOKEN
-          docker pull docker.pkg.github.com/jina-ai/jina/jina:test-pip
-          docker tag docker.pkg.github.com/jina-ai/jina/jina:test-pip jinaai/jina:test-pip
+          docker pull docker.pkg.github.com/jina-ai/jina/jina:test-pip${{env.GITHUB_RUN_ID}}
+          docker tag docker.pkg.github.com/jina-ai/jina/jina:test-pip${{env.GITHUB_RUN_ID}} jinaai/jina:test-pip
           python -m pip install --upgrade pip
           pip install ".[cicd,test,daemon]" --no-cache-dir
           jina check

diff --git a/jina/executors/__init__.py b/jina/executors/__init__.py
@@ -112,7 +112,8 @@ def __init__(awesomeness = 5):
 
     """
     store_args_kwargs = False  #: set this to ``True`` to save ``args`` (in a list) and ``kwargs`` (in a map) in YAML config
-    exec_methods = ['encode', 'add', 'query', 'craft', 'segment', 'score', 'evaluate', 'predict', 'query_by_id', 'delete', 'update']
+    exec_methods = ['encode', 'add', 'query', 'craft', 'segment', 'score', 'evaluate', 'predict', 'query_by_id',
+                    'delete', 'update']
 
     def __init__(self, *args, **kwargs):
         if isinstance(args, tuple) and len(args) > 0:
@@ -257,7 +258,7 @@ def current_workspace(self) -> str:
         :return: if ``separated_workspace`` is set to ``False`` then ``metas.workspace`` is returned,
                 otherwise the ``metas.pea_workspace`` is returned
         """
-        work_dir = self.pea_workspace if self.separated_workspace else self.workspace  # type: str
+        work_dir = self.pea_workspace if self.separated_workspace and self.pea_id != -1 else self.workspace  # type: str
         return work_dir
 
     def get_file_from_workspace(self, name: str) -> str:

diff --git a/jina/jaml/parsers/executor/legacy.py b/jina/jaml/parsers/executor/legacy.py
@@ -12,7 +12,7 @@ class LegacyParser(VersionedYAMLParser):
     @staticmethod
     def _get_dump_path_from_config(meta_config: Dict):
         if 'name' in meta_config:
-            if meta_config.get('separated_workspace', False) is True:
+            if meta_config.get('separated_workspace', False) is True and meta_config['pea_id'] != -1:
                 if 'pea_id' in meta_config and isinstance(meta_config['pea_id'], int):
                     work_dir = meta_config['pea_workspace']
                     dump_path = os.path.join(work_dir, f'{meta_config["name"]}.{"bin"}')

diff --git a/scripts/get-all-test-paths.sh b/scripts/get-all-test-paths.sh
@@ -2,8 +2,8 @@
 
 set -ex
 
-declare -a array1=( "tests/unit/*.py" "tests/integration/*.py" )
-declare -a array2=( $(ls -d tests/{unit,integration}/*/ | grep -v '__pycache__' ))
+declare -a array1=( "tests/unit/*.py" "tests/integration/*.py" "tests/distributed/*.py" )
+declare -a array2=( $(ls -d tests/{unit,integration,distributed}/*/ | grep -v '__pycache__' ))
 dest1=( "${array1[@]}" "${array2[@]}" )
 
 declare -a array1=( "tests/jinad/unit/*.py" "tests/jinad/integration/*.py" )

diff --git a/scripts/get-test-paths.sh b/scripts/get-test-paths.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-declare -a array1=( "${1}/unit/*.py" "${1}/integration/*.py" )
-declare -a array2=( $(ls -d ${1}/{unit,integration}/*/ | grep -v '__pycache__' ))
+declare -a array1=( "${1}/unit/*.py" "${1}/integration/*.py" "${1}/distributed/*.py")
+declare -a array2=( $(ls -d ${1}/{unit,integration,distributed}/*/ | grep -v '__pycache__' ))
 dest=( "${array1[@]}" "${array2[@]}" )
 printf '%s\n' "${dest[@]}" | jq -R . | jq -cs .
diff --git a/.../integration/test_index_query/__init__.py → tests/distributed/__init__.py b/.../integration/test_index_query/__init__.py → tests/distributed/__init__.py
diff --git a/tests/jinad/integration/helpers.py → tests/distributed/helpers.py b/tests/jinad/integration/helpers.py → tests/distributed/helpers.py
@@ -18,6 +18,7 @@ def invoke_requests(method: str,
         print(f'got an exception while invoking request {e!r}')
         return
 
+
 def get_results(query: str,
                 url: str = 'http://0.0.0.0:45678/api/search',
                 method: str = 'post',

diff --git a/...s/jinad/integration/test_index_query/.env → tests/distributed/test_index_query/.env b/...s/jinad/integration/test_index_query/.env → tests/distributed/test_index_query/.env
diff --git a/...gration/test_index_query/pods/__init__.py → .../distributed/test_index_query/__init__.py b/...gration/test_index_query/pods/__init__.py → .../distributed/test_index_query/__init__.py
diff --git a/...ation/test_index_query/docker-compose.yml → ...buted/test_index_query/docker-compose.yml b/...ation/test_index_query/docker-compose.yml → ...buted/test_index_query/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "8000:8000"
       - "45678:45678"
     env_file:
-      - tests/jinad/integration/test_index_query/.env
+      - tests/distributed/test_index_query/.env
     expose:
       - 10000-60000
   encoder:
@@ -18,11 +18,11 @@ services:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_index_query/.env
+      - tests/distributed/test_index_query/.env
   indexer:
     image: test_index_query
     expose:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_index_query/.env
+      - tests/distributed/test_index_query/.env
diff --git a/...nad/integration/test_index_query/flow.yml → tests/distributed/test_index_query/flow.yml b/...nad/integration/test_index_query/flow.yml → tests/distributed/test_index_query/flow.yml
diff --git a/.../test_index_query_with_shards/__init__.py → ...ributed/test_index_query/pods/__init__.py b/.../test_index_query_with_shards/__init__.py → ...ributed/test_index_query/pods/__init__.py
diff --git a/...on/test_index_query/pods/dummy-encoder.py → ...ed/test_index_query/pods/dummy-encoder.py b/...on/test_index_query/pods/dummy-encoder.py → ...ed/test_index_query/pods/dummy-encoder.py
diff --git a/...egration/test_index_query/pods/encode.yml → ...tributed/test_index_query/pods/encode.yml b/...egration/test_index_query/pods/encode.yml → ...tributed/test_index_query/pods/encode.yml
diff --git a/...tegration/test_index_query/pods/index.yml → ...stributed/test_index_query/pods/index.yml b/...tegration/test_index_query/pods/index.yml → ...stributed/test_index_query/pods/index.yml
diff --git a/...tion/test_index_query/test_integration.py → ...uted/test_index_query/test_integration.py b/...tion/test_index_query/test_integration.py → ...uted/test_index_query/test_integration.py
@@ -13,7 +13,6 @@
 @pytest.mark.parametrize('docker_compose', [compose_yml], indirect=['docker_compose'])
 def test_index_query(docker_compose):
     flow_id = create_flow(flow_yml, pod_dir)['flow_id']
-    print(f'Flow created with id {flow_id}')
 
     r = invoke_requests(method='post',
                         url='http://0.0.0.0:45678/api/index',

diff --git a/...gration/test_index_query_with_shards/.env → ...ributed/test_index_query_with_shards/.env b/...gration/test_index_query_with_shards/.env → ...ributed/test_index_query_with_shards/.env
diff --git a/..._index_query_with_shards/pods/__init__.py → .../test_index_query_with_shards/__init__.py b/..._index_query_with_shards/pods/__init__.py → .../test_index_query_with_shards/__init__.py
diff --git a/...ndex_query_with_shards/docker-compose.yml → ...ndex_query_with_shards/docker-compose.yml b/...ndex_query_with_shards/docker-compose.yml → ...ndex_query_with_shards/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "8000:8000"
       - "45678:45678"
     env_file:
-      - tests/jinad/integration/test_index_query_with_shards/.env
+      - tests/distributed/test_index_query_with_shards/.env
     expose:
       - 10000-60000
   encoder:
@@ -18,11 +18,11 @@ services:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_index_query_with_shards/.env
+      - tests/distributed/test_index_query_with_shards/.env
   indexer:
     image: test_index_query_with_shards
     expose:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_index_query_with_shards/.env
+      - tests/distributed/test_index_query_with_shards/.env
diff --git a/...ion/test_index_query_with_shards/flow.yml → ...ted/test_index_query_with_shards/flow.yml b/...ion/test_index_query_with_shards/flow.yml → ...ted/test_index_query_with_shards/flow.yml
diff --git a/...local_flow_local_remote_local/__init__.py → ..._index_query_with_shards/pods/__init__.py b/...local_flow_local_remote_local/__init__.py → ..._index_query_with_shards/pods/__init__.py
diff --git a/...x_query_with_shards/pods/dummy-encoder.py → ...x_query_with_shards/pods/dummy-encoder.py b/...x_query_with_shards/pods/dummy-encoder.py → ...x_query_with_shards/pods/dummy-encoder.py
diff --git a/...t_index_query_with_shards/pods/encode.yml → ...t_index_query_with_shards/pods/encode.yml b/...t_index_query_with_shards/pods/encode.yml → ...t_index_query_with_shards/pods/encode.yml
diff --git a/...st_index_query_with_shards/pods/index.yml → ...st_index_query_with_shards/pods/index.yml b/...st_index_query_with_shards/pods/index.yml → ...st_index_query_with_shards/pods/index.yml
diff --git a/...st_index_query_with_shards/pods/slice.yml → ...st_index_query_with_shards/pods/slice.yml b/...st_index_query_with_shards/pods/slice.yml → ...st_index_query_with_shards/pods/slice.yml
diff --git a/...dex_query_with_shards/test_integration.py → ...dex_query_with_shards/test_integration.py b/...dex_query_with_shards/test_integration.py → ...dex_query_with_shards/test_integration.py
diff --git a/...n/test_local_flow_local_remote_local/.env → ...d/test_local_flow_local_remote_local/.env b/...n/test_local_flow_local_remote_local/.env → ...d/test_local_flow_local_remote_local/.env
diff --git a/...ocal_flow_remote_local_remote/__init__.py → ...local_flow_local_remote_local/__init__.py b/...ocal_flow_remote_local_remote/__init__.py → ...local_flow_local_remote_local/__init__.py
diff --git a/...t_local_flow_local_remote_local/craft.yml → ...t_local_flow_local_remote_local/craft.yml b/...t_local_flow_local_remote_local/craft.yml → ...t_local_flow_local_remote_local/craft.yml
diff --git a/...low_local_remote_local/docker-compose.yml → ...low_local_remote_local/docker-compose.yml b/...low_local_remote_local/docker-compose.yml → ...low_local_remote_local/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "45005:45005"
       - "45006:45006"
     env_file:
-      - tests/jinad/integration/test_local_flow_remote_local_remote/.env
+      - tests/distributed/test_local_flow_remote_local_remote/.env
     expose:
       - 10000-60000
     networks:

diff --git a/..._flow_local_remote_local/dummy-crafter.py → ..._flow_local_remote_local/dummy-crafter.py b/..._flow_local_remote_local/dummy-crafter.py → ..._flow_local_remote_local/dummy-crafter.py
diff --git a/..._flow_local_remote_local/dummy-encoder.py → ..._flow_local_remote_local/dummy-encoder.py b/..._flow_local_remote_local/dummy-encoder.py → ..._flow_local_remote_local/dummy-encoder.py
diff --git a/..._local_flow_local_remote_local/encode.yml → ..._local_flow_local_remote_local/encode.yml b/..._local_flow_local_remote_local/encode.yml → ..._local_flow_local_remote_local/encode.yml
diff --git a/...st_local_flow_local_remote_local/flow.yml → ...st_local_flow_local_remote_local/flow.yml b/...st_local_flow_local_remote_local/flow.yml → ...st_local_flow_local_remote_local/flow.yml
diff --git a/...t_local_flow_local_remote_local/index.yml → ...t_local_flow_local_remote_local/index.yml b/...t_local_flow_local_remote_local/index.yml → ...t_local_flow_local_remote_local/index.yml
diff --git a/...ow_local_remote_local/test_integration.py → ...ow_local_remote_local/test_integration.py b/...ow_local_remote_local/test_integration.py → ...ow_local_remote_local/test_integration.py
diff --git a/.../test_local_flow_remote_local_remote/.env → .../test_local_flow_remote_local_remote/.env b/.../test_local_flow_remote_local_remote/.env → .../test_local_flow_remote_local_remote/.env
diff --git a/...ation/test_simple_distributed/__init__.py → ...ocal_flow_remote_local_remote/__init__.py b/...ation/test_simple_distributed/__init__.py → ...ocal_flow_remote_local_remote/__init__.py
diff --git a/..._local_flow_remote_local_remote/craft.yml → ..._local_flow_remote_local_remote/craft.yml b/..._local_flow_remote_local_remote/craft.yml → ..._local_flow_remote_local_remote/craft.yml
diff --git a/...ow_remote_local_remote/docker-compose.yml → ...ow_remote_local_remote/docker-compose.yml b/...ow_remote_local_remote/docker-compose.yml → ...ow_remote_local_remote/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - "45005:45005"
       - "45006:45006"
     env_file:
-      - tests/jinad/integration/test_local_flow_remote_local_remote/.env
+      - tests/distributed/test_local_flow_remote_local_remote/.env
     expose:
       - 10000-60000
     networks:
@@ -27,7 +27,7 @@ services:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_local_flow_remote_local_remote/.env
+      - tests/distributed/test_local_flow_remote_local_remote/.env
     networks:
       testing_net:
         ipv4_address: 172.28.1.2

diff --git a/...flow_remote_local_remote/dummy-crafter.py → ...flow_remote_local_remote/dummy-crafter.py b/...flow_remote_local_remote/dummy-crafter.py → ...flow_remote_local_remote/dummy-crafter.py
diff --git a/...flow_remote_local_remote/dummy-encoder.py → ...flow_remote_local_remote/dummy-encoder.py b/...flow_remote_local_remote/dummy-encoder.py → ...flow_remote_local_remote/dummy-encoder.py
diff --git a/...local_flow_remote_local_remote/encode.yml → ...local_flow_remote_local_remote/encode.yml b/...local_flow_remote_local_remote/encode.yml → ...local_flow_remote_local_remote/encode.yml
diff --git a/...t_local_flow_remote_local_remote/flow.yml → ...t_local_flow_remote_local_remote/flow.yml b/...t_local_flow_remote_local_remote/flow.yml → ...t_local_flow_remote_local_remote/flow.yml
diff --git a/..._local_flow_remote_local_remote/index.yml → ..._local_flow_remote_local_remote/index.yml b/..._local_flow_remote_local_remote/index.yml → ..._local_flow_remote_local_remote/index.yml
diff --git a/...w_remote_local_remote/test_integration.py → ...w_remote_local_remote/test_integration.py b/...w_remote_local_remote/test_integration.py → ...w_remote_local_remote/test_integration.py
diff --git a/.../integration/test_simple_distributed/.env → .../distributed/test_simple_distributed/.env b/.../integration/test_simple_distributed/.env → .../distributed/test_simple_distributed/.env
diff --git a/.../test_simple_distributed/pods/__init__.py → ...buted/test_simple_distributed/__init__.py b/.../test_simple_distributed/pods/__init__.py → ...buted/test_simple_distributed/__init__.py
diff --git a/...est_simple_distributed/docker-compose.yml → ...est_simple_distributed/docker-compose.yml b/...est_simple_distributed/docker-compose.yml → ...est_simple_distributed/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "8000:8000"
       - "45678:45678"
     env_file:
-      - tests/jinad/integration/test_simple_distributed/.env
+      - tests/distributed/test_simple_distributed/.env
     expose:
       - 10000-60000
   encoder:
@@ -18,11 +18,11 @@ services:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_simple_distributed/.env
+      - tests/distributed/test_simple_distributed/.env
   indexer:
     image: test_simple_distributed
     expose:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_simple_distributed/.env
+      - tests/distributed/test_simple_distributed/.env
diff --git a/...egration/test_simple_distributed/flow.yml → ...tributed/test_simple_distributed/flow.yml b/...egration/test_simple_distributed/flow.yml → ...tributed/test_simple_distributed/flow.yml
diff --git a/...imple_distributed_with_shards/__init__.py → .../test_simple_distributed/pods/__init__.py b/...imple_distributed_with_shards/__init__.py → .../test_simple_distributed/pods/__init__.py
diff --git a/..._simple_distributed/pods/dummy-encoder.py → ..._simple_distributed/pods/dummy-encoder.py b/..._simple_distributed/pods/dummy-encoder.py → ..._simple_distributed/pods/dummy-encoder.py
diff --git a/...n/test_simple_distributed/pods/encode.yml → ...d/test_simple_distributed/pods/encode.yml b/...n/test_simple_distributed/pods/encode.yml → ...d/test_simple_distributed/pods/encode.yml
diff --git a/...on/test_simple_distributed/pods/index.yml → ...ed/test_simple_distributed/pods/index.yml b/...on/test_simple_distributed/pods/index.yml → ...ed/test_simple_distributed/pods/index.yml
diff --git a/...st_simple_distributed/test_integration.py → ...st_simple_distributed/test_integration.py b/...st_simple_distributed/test_integration.py → ...st_simple_distributed/test_integration.py
diff --git a/.../test_simple_distributed_with_shards/.env → .../test_simple_distributed_with_shards/.env b/.../test_simple_distributed_with_shards/.env → .../test_simple_distributed_with_shards/.env
diff --git a/...egration/test_simple_hub_pods/__init__.py → ...imple_distributed_with_shards/__init__.py b/...egration/test_simple_hub_pods/__init__.py → ...imple_distributed_with_shards/__init__.py
diff --git a/...istributed_with_shards/docker-compose.yml → ...istributed_with_shards/docker-compose.yml b/...istributed_with_shards/docker-compose.yml → ...istributed_with_shards/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "8000:8000"
       - "45678:45678"
     env_file:
-      - tests/jinad/integration/test_simple_distributed_with_shards/.env
+      - tests/distributed/test_simple_distributed_with_shards/.env
     expose:
       - 10000-60000
   pod1:
@@ -18,11 +18,11 @@ services:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_simple_distributed_with_shards/.env
+      - tests/distributed/test_simple_distributed_with_shards/.env
   pod2:
     image: test_simple_distributed_with_shards
     expose:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_simple_distributed_with_shards/.env
+      - tests/distributed/test_simple_distributed_with_shards/.env
diff --git a/...t_simple_distributed_with_shards/flow.yml → ...t_simple_distributed_with_shards/flow.yml b/...t_simple_distributed_with_shards/flow.yml → ...t_simple_distributed_with_shards/flow.yml
diff --git a/...stributed_with_shards/test_integration.py → ...stributed_with_shards/test_integration.py b/...stributed_with_shards/test_integration.py → ...stributed_with_shards/test_integration.py
diff --git a/...nad/integration/test_simple_hub_pods/.env → tests/distributed/test_simple_hub_pods/.env b/...nad/integration/test_simple_hub_pods/.env → tests/distributed/test_simple_hub_pods/.env
diff --git a/...tion/test_simple_local_remote/__init__.py → ...tributed/test_simple_hub_pods/__init__.py b/...tion/test_simple_local_remote/__init__.py → ...tributed/test_simple_hub_pods/__init__.py
diff --git a/...n/test_simple_hub_pods/docker-compose.yml → ...d/test_simple_hub_pods/docker-compose.yml b/...n/test_simple_hub_pods/docker-compose.yml → ...d/test_simple_hub_pods/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - "8000:8000"
       - "45678:45678"
     env_file:
-      - tests/jinad/integration/test_simple_hub_pods/.env
+      - tests/distributed/test_simple_hub_pods/.env
     expose:
       - 10000-60000
     volumes:
@@ -20,7 +20,7 @@ services:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_simple_hub_pods/.env
+      - tests/distributed/test_simple_hub_pods/.env
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   pod2:
@@ -29,6 +29,6 @@ services:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_simple_hub_pods/.env
+      - tests/distributed/test_simple_hub_pods/.env
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/...integration/test_simple_hub_pods/flow.yml → ...distributed/test_simple_hub_pods/flow.yml b/...integration/test_simple_hub_pods/flow.yml → ...distributed/test_simple_hub_pods/flow.yml
diff --git a/.../test_simple_hub_pods/test_integration.py → .../test_simple_hub_pods/test_integration.py b/.../test_simple_hub_pods/test_integration.py → .../test_simple_hub_pods/test_integration.py
diff --git a/...integration/test_simple_local_remote/.env → ...distributed/test_simple_local_remote/.env b/...integration/test_simple_local_remote/.env → ...distributed/test_simple_local_remote/.env
diff --git a/tests/distributed/test_simple_local_remote/__init__.py b/tests/distributed/test_simple_local_remote/__init__.py
diff --git a/...st_simple_local_remote/docker-compose.yml → ...st_simple_local_remote/docker-compose.yml b/...st_simple_local_remote/docker-compose.yml → ...st_simple_local_remote/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - "45001:45001"
       - "45002:45002"
     env_file:
-      - tests/jinad/integration/test_simple_local_remote/.env
+      - tests/distributed/test_simple_local_remote/.env
     expose:
       - 10000-60000
     networks:
@@ -23,7 +23,7 @@ services:
       - 8000
       - 10000-60000
     env_file:
-      - tests/jinad/integration/test_simple_local_remote/.env
+      - tests/distributed/test_simple_local_remote/.env
     networks:
       testing_net:
         ipv4_address: 172.28.1.2

diff --git a/...test_simple_local_remote/dummy-encoder.py → ...test_simple_local_remote/dummy-encoder.py b/...test_simple_local_remote/dummy-encoder.py → ...test_simple_local_remote/dummy-encoder.py
diff --git a/...ation/test_simple_local_remote/encode.yml → ...buted/test_simple_local_remote/encode.yml b/...ation/test_simple_local_remote/encode.yml → ...buted/test_simple_local_remote/encode.yml
diff --git a/...gration/test_simple_local_remote/flow.yml → ...ributed/test_simple_local_remote/flow.yml b/...gration/test_simple_local_remote/flow.yml → ...ributed/test_simple_local_remote/flow.yml
diff --git a/...ration/test_simple_local_remote/index.yml → ...ibuted/test_simple_local_remote/index.yml b/...ration/test_simple_local_remote/index.yml → ...ibuted/test_simple_local_remote/index.yml
diff --git a/...t_simple_local_remote/test_integration.py → ...t_simple_local_remote/test_integration.py b/...t_simple_local_remote/test_integration.py → ...t_simple_local_remote/test_integration.py
diff --git a/tests/integration/incremental_indexing/test_unique_indexing.py b/tests/integration/incremental_indexing/test_unique_indexing.py
@@ -30,13 +30,14 @@ def test_unique_indexing_vecindexers(random_workspace, restful):
         assert vector_indexer.size == num_uniq_docs
 
 
+@pytest.mark.parametrize('separated_workspace', [False, True])
 @pytest.mark.parametrize('restful', [False, True])
-def test_unique_indexing_docindexers(random_workspace, restful):
+def test_unique_indexing_docindexers(random_workspace, restful, separated_workspace):
     total_docs = 10
     duplicate_docs, num_uniq_docs = get_duplicate_docs(num_docs=total_docs)
 
     f = (Flow(restful=restful)
-         .add(uses=os.path.join(cur_dir, 'uniq_docindexer.yml'), shards=1))
+         .add(uses=os.path.join(cur_dir, 'uniq_docindexer.yml'), shards=1, separated_workspace=separated_workspace))
 
     with f:
         f.index(duplicate_docs)

diff --git a/tests/unit/test_index.py b/tests/unit/test_index.py
@@ -157,9 +157,7 @@ def test_index(test_workspace_index):
     f = Flow().add(uses=os.path.join(cur_dir, 'yaml/test-index.yml'), parallel=3, separated_workspace=True)
     with f:
         f.index(input_fn=random_docs(50))
-
     for j in range(3):
-        assert os.path.join(test_workspace_index, f'test2-{j + 1}/test2.bin')
         assert os.path.exists(os.path.join(test_workspace_index, f'test2-{j + 1}/tmp2'))