From 84da80c1f3eef120e5fd5a66a8f2d61074ec85da Mon Sep 17 00:00:00 2001 From: Massimiliano Pippi Date: Wed, 29 Nov 2023 18:58:44 +0100 Subject: [PATCH] chore: make `core` tests layout consistent (#6449) * move unit tests up * move tests up one dir, make them unit --- test/core/pipeline/integration/__init__.py | 3 --- test/core/pipeline/{integration => }/test_complex_pipeline.py | 0 test/core/pipeline/{unit => }/test_connections.py | 0 test/core/pipeline/{integration => }/test_default_value.py | 0 .../pipeline/{integration => }/test_distinct_loops_pipeline.py | 0 .../pipeline/{integration => }/test_double_loop_pipeline.py | 0 test/core/pipeline/{unit => }/test_draw.py | 0 test/core/pipeline/{unit => }/test_draw_graphviz.py | 0 .../pipeline/{integration => }/test_dynamic_inputs_pipeline.py | 0 .../test_fixed_decision_and_merge_pipeline.py | 0 .../pipeline/{integration => }/test_fixed_decision_pipeline.py | 0 .../pipeline/{integration => }/test_fixed_merging_pipeline.py | 0 test/core/pipeline/{integration => }/test_joiners.py | 0 test/core/pipeline/{integration => }/test_linear_pipeline.py | 0 .../{integration => }/test_looping_and_merge_pipeline.py | 0 test/core/pipeline/{integration => }/test_looping_pipeline.py | 0 test/core/pipeline/{integration => }/test_mutable_inputs.py | 0 .../{integration => }/test_parallel_branches_pipeline.py | 0 test/core/pipeline/{unit => }/test_pipeline.py | 0 test/core/pipeline/{integration => }/test_self_loop.py | 0 test/core/pipeline/{unit => }/test_validation_pipeline_io.py | 0 .../test_variable_decision_and_merge_pipeline.py | 0 .../{integration => }/test_variable_decision_pipeline.py | 0 .../{integration => }/test_variable_merging_pipeline.py | 0 test/core/pipeline/unit/__init__.py | 3 --- 25 files changed, 6 deletions(-) delete mode 100644 test/core/pipeline/integration/__init__.py rename test/core/pipeline/{integration => }/test_complex_pipeline.py (100%) rename test/core/pipeline/{unit => }/test_connections.py (100%) rename test/core/pipeline/{integration => }/test_default_value.py (100%) rename test/core/pipeline/{integration => }/test_distinct_loops_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_double_loop_pipeline.py (100%) rename test/core/pipeline/{unit => }/test_draw.py (100%) rename test/core/pipeline/{unit => }/test_draw_graphviz.py (100%) rename test/core/pipeline/{integration => }/test_dynamic_inputs_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_fixed_decision_and_merge_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_fixed_decision_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_fixed_merging_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_joiners.py (100%) rename test/core/pipeline/{integration => }/test_linear_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_looping_and_merge_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_looping_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_mutable_inputs.py (100%) rename test/core/pipeline/{integration => }/test_parallel_branches_pipeline.py (100%) rename test/core/pipeline/{unit => }/test_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_self_loop.py (100%) rename test/core/pipeline/{unit => }/test_validation_pipeline_io.py (100%) rename test/core/pipeline/{integration => }/test_variable_decision_and_merge_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_variable_decision_pipeline.py (100%) rename test/core/pipeline/{integration => }/test_variable_merging_pipeline.py (100%) delete mode 100644 test/core/pipeline/unit/__init__.py diff --git a/test/core/pipeline/integration/__init__.py b/test/core/pipeline/integration/__init__.py deleted file mode 100644 index c1764a6e0..000000000 --- a/test/core/pipeline/integration/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-FileCopyrightText: 2022-present deepset GmbH -# -# SPDX-License-Identifier: Apache-2.0 diff --git a/test/core/pipeline/integration/test_complex_pipeline.py b/test/core/pipeline/test_complex_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_complex_pipeline.py rename to test/core/pipeline/test_complex_pipeline.py diff --git a/test/core/pipeline/unit/test_connections.py b/test/core/pipeline/test_connections.py similarity index 100% rename from test/core/pipeline/unit/test_connections.py rename to test/core/pipeline/test_connections.py diff --git a/test/core/pipeline/integration/test_default_value.py b/test/core/pipeline/test_default_value.py similarity index 100% rename from test/core/pipeline/integration/test_default_value.py rename to test/core/pipeline/test_default_value.py diff --git a/test/core/pipeline/integration/test_distinct_loops_pipeline.py b/test/core/pipeline/test_distinct_loops_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_distinct_loops_pipeline.py rename to test/core/pipeline/test_distinct_loops_pipeline.py diff --git a/test/core/pipeline/integration/test_double_loop_pipeline.py b/test/core/pipeline/test_double_loop_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_double_loop_pipeline.py rename to test/core/pipeline/test_double_loop_pipeline.py diff --git a/test/core/pipeline/unit/test_draw.py b/test/core/pipeline/test_draw.py similarity index 100% rename from test/core/pipeline/unit/test_draw.py rename to test/core/pipeline/test_draw.py diff --git a/test/core/pipeline/unit/test_draw_graphviz.py b/test/core/pipeline/test_draw_graphviz.py similarity index 100% rename from test/core/pipeline/unit/test_draw_graphviz.py rename to test/core/pipeline/test_draw_graphviz.py diff --git a/test/core/pipeline/integration/test_dynamic_inputs_pipeline.py b/test/core/pipeline/test_dynamic_inputs_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_dynamic_inputs_pipeline.py rename to test/core/pipeline/test_dynamic_inputs_pipeline.py diff --git a/test/core/pipeline/integration/test_fixed_decision_and_merge_pipeline.py b/test/core/pipeline/test_fixed_decision_and_merge_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_fixed_decision_and_merge_pipeline.py rename to test/core/pipeline/test_fixed_decision_and_merge_pipeline.py diff --git a/test/core/pipeline/integration/test_fixed_decision_pipeline.py b/test/core/pipeline/test_fixed_decision_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_fixed_decision_pipeline.py rename to test/core/pipeline/test_fixed_decision_pipeline.py diff --git a/test/core/pipeline/integration/test_fixed_merging_pipeline.py b/test/core/pipeline/test_fixed_merging_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_fixed_merging_pipeline.py rename to test/core/pipeline/test_fixed_merging_pipeline.py diff --git a/test/core/pipeline/integration/test_joiners.py b/test/core/pipeline/test_joiners.py similarity index 100% rename from test/core/pipeline/integration/test_joiners.py rename to test/core/pipeline/test_joiners.py diff --git a/test/core/pipeline/integration/test_linear_pipeline.py b/test/core/pipeline/test_linear_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_linear_pipeline.py rename to test/core/pipeline/test_linear_pipeline.py diff --git a/test/core/pipeline/integration/test_looping_and_merge_pipeline.py b/test/core/pipeline/test_looping_and_merge_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_looping_and_merge_pipeline.py rename to test/core/pipeline/test_looping_and_merge_pipeline.py diff --git a/test/core/pipeline/integration/test_looping_pipeline.py b/test/core/pipeline/test_looping_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_looping_pipeline.py rename to test/core/pipeline/test_looping_pipeline.py diff --git a/test/core/pipeline/integration/test_mutable_inputs.py b/test/core/pipeline/test_mutable_inputs.py similarity index 100% rename from test/core/pipeline/integration/test_mutable_inputs.py rename to test/core/pipeline/test_mutable_inputs.py diff --git a/test/core/pipeline/integration/test_parallel_branches_pipeline.py b/test/core/pipeline/test_parallel_branches_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_parallel_branches_pipeline.py rename to test/core/pipeline/test_parallel_branches_pipeline.py diff --git a/test/core/pipeline/unit/test_pipeline.py b/test/core/pipeline/test_pipeline.py similarity index 100% rename from test/core/pipeline/unit/test_pipeline.py rename to test/core/pipeline/test_pipeline.py diff --git a/test/core/pipeline/integration/test_self_loop.py b/test/core/pipeline/test_self_loop.py similarity index 100% rename from test/core/pipeline/integration/test_self_loop.py rename to test/core/pipeline/test_self_loop.py diff --git a/test/core/pipeline/unit/test_validation_pipeline_io.py b/test/core/pipeline/test_validation_pipeline_io.py similarity index 100% rename from test/core/pipeline/unit/test_validation_pipeline_io.py rename to test/core/pipeline/test_validation_pipeline_io.py diff --git a/test/core/pipeline/integration/test_variable_decision_and_merge_pipeline.py b/test/core/pipeline/test_variable_decision_and_merge_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_variable_decision_and_merge_pipeline.py rename to test/core/pipeline/test_variable_decision_and_merge_pipeline.py diff --git a/test/core/pipeline/integration/test_variable_decision_pipeline.py b/test/core/pipeline/test_variable_decision_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_variable_decision_pipeline.py rename to test/core/pipeline/test_variable_decision_pipeline.py diff --git a/test/core/pipeline/integration/test_variable_merging_pipeline.py b/test/core/pipeline/test_variable_merging_pipeline.py similarity index 100% rename from test/core/pipeline/integration/test_variable_merging_pipeline.py rename to test/core/pipeline/test_variable_merging_pipeline.py diff --git a/test/core/pipeline/unit/__init__.py b/test/core/pipeline/unit/__init__.py deleted file mode 100644 index c1764a6e0..000000000 --- a/test/core/pipeline/unit/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-FileCopyrightText: 2022-present deepset GmbH -# -# SPDX-License-Identifier: Apache-2.0