Browse Source

fix: tests should use fixture instead of import from conftest

trgiangdo 1 year ago
parent
commit
46b2ddd339

+ 7 - 15
tests/core/scenario/test_scenario_manager_with_sql_repo.py

@@ -20,27 +20,19 @@ from taipy.core._orchestrator._orchestrator_factory import _OrchestratorFactory
 from taipy.core._version._version_manager import _VersionManager
 from taipy.core._version._version_manager import _VersionManager
 from taipy.core.config.job_config import JobConfig
 from taipy.core.config.job_config import JobConfig
 from taipy.core.cycle._cycle_manager import _CycleManager
 from taipy.core.cycle._cycle_manager import _CycleManager
-from taipy.core.cycle._cycle_manager_factory import _CycleManagerFactory
 from taipy.core.data._data_manager import _DataManager
 from taipy.core.data._data_manager import _DataManager
-from taipy.core.data._data_manager_factory import _DataManagerFactory
 from taipy.core.data.in_memory import InMemoryDataNode
 from taipy.core.data.in_memory import InMemoryDataNode
 from taipy.core.exceptions.exceptions import DeletingPrimaryScenario
 from taipy.core.exceptions.exceptions import DeletingPrimaryScenario
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
-from taipy.core.scenario._scenario_manager_factory import _ScenarioManagerFactory
 from taipy.core.scenario.scenario import Scenario
 from taipy.core.scenario.scenario import Scenario
 from taipy.core.scenario.scenario_id import ScenarioId
 from taipy.core.scenario.scenario_id import ScenarioId
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
-from taipy.core.sequence._sequence_manager_factory import _SequenceManagerFactory
-from taipy.core.sequence.sequence import Sequence
-from taipy.core.sequence.sequence_id import SequenceId
 from taipy.core.task._task_manager import _TaskManager
 from taipy.core.task._task_manager import _TaskManager
-from taipy.core.task._task_manager_factory import _TaskManagerFactory
 from taipy.core.task.task import Task
 from taipy.core.task.task import Task
 from taipy.core.task.task_id import TaskId
 from taipy.core.task.task_id import TaskId
-from tests.core.conftest import init_managers
 
 
 
 
-def test_set_and_get_scenario(cycle, init_sql_repo):
+def test_set_and_get_scenario(cycle, init_sql_repo, init_managers):
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
     init_managers()
     init_managers()
@@ -208,7 +200,7 @@ def test_set_and_get_scenario(cycle, init_sql_repo):
     assert _TaskManager._get(task_2.id).id == task_2.id
     assert _TaskManager._get(task_2.id).id == task_2.id
 
 
 
 
-def test_get_all_on_multiple_versions_environment(init_sql_repo):
+def test_get_all_on_multiple_versions_environment(init_sql_repo, init_managers):
     init_managers()
     init_managers()
 
 
     # Create 5 scenarios with 2 versions each
     # Create 5 scenarios with 2 versions each
@@ -241,7 +233,7 @@ def test_get_all_on_multiple_versions_environment(init_sql_repo):
     assert len(_ScenarioManager._get_all_by(filters=[{"version": "2.0", "config_id": "config_id_6"}])) == 1
     assert len(_ScenarioManager._get_all_by(filters=[{"version": "2.0", "config_id": "config_id_6"}])) == 1
 
 
 
 
-def test_create_scenario_does_not_modify_config(init_sql_repo):
+def test_create_scenario_does_not_modify_config(init_sql_repo, init_managers):
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
     init_managers()
     init_managers()
@@ -273,7 +265,7 @@ def test_create_scenario_does_not_modify_config(init_sql_repo):
     assert scenario_2.name is None
     assert scenario_2.name is None
 
 
 
 
-def test_create_and_delete_scenario(init_sql_repo):
+def test_create_and_delete_scenario(init_sql_repo, init_managers):
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
     init_managers()
     init_managers()
@@ -358,7 +350,7 @@ def mult_by_4(nb: int):
     return nb * 4
     return nb * 4
 
 
 
 
-def test_scenario_manager_only_creates_data_node_once(init_sql_repo):
+def test_scenario_manager_only_creates_data_node_once(init_sql_repo, init_managers):
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
     init_managers()
     init_managers()
@@ -417,7 +409,7 @@ def test_scenario_manager_only_creates_data_node_once(init_sql_repo):
     assert len(_ScenarioManager._get_all()) == 2
     assert len(_ScenarioManager._get_all()) == 2
 
 
 
 
-def test_get_scenarios_by_config_id(init_sql_repo):
+def test_get_scenarios_by_config_id(init_sql_repo, init_managers):
     init_managers()
     init_managers()
 
 
     scenario_config_1 = Config.configure_scenario("s1", sequence_configs=[])
     scenario_config_1 = Config.configure_scenario("s1", sequence_configs=[])
@@ -449,7 +441,7 @@ def test_get_scenarios_by_config_id(init_sql_repo):
     assert sorted([s_3_1.id]) == sorted([scenario.id for scenario in s3_scenarios])
     assert sorted([s_3_1.id]) == sorted([scenario.id for scenario in s3_scenarios])
 
 
 
 
-def test_get_scenarios_by_config_id_in_multiple_versions_environment(init_sql_repo):
+def test_get_scenarios_by_config_id_in_multiple_versions_environment(init_sql_repo, init_managers):
     init_managers()
     init_managers()
 
 
     scenario_config_1 = Config.configure_scenario("s1", sequence_configs=[])
     scenario_config_1 = Config.configure_scenario("s1", sequence_configs=[])

+ 7 - 7
tests/core/sequence/test_sequence_manager_with_sql_repo.py

@@ -10,6 +10,7 @@
 # specific language governing permissions and limitations under the License.
 # specific language governing permissions and limitations under the License.
 
 
 import pytest
 import pytest
+
 from taipy.config.common.scope import Scope
 from taipy.config.common.scope import Scope
 from taipy.config.config import Config
 from taipy.config.config import Config
 from taipy.core._orchestrator._orchestrator_factory import _OrchestratorFactory
 from taipy.core._orchestrator._orchestrator_factory import _OrchestratorFactory
@@ -25,10 +26,9 @@ from taipy.core.sequence.sequence_id import SequenceId
 from taipy.core.task._task_manager import _TaskManager
 from taipy.core.task._task_manager import _TaskManager
 from taipy.core.task.task import Task
 from taipy.core.task.task import Task
 from taipy.core.task.task_id import TaskId
 from taipy.core.task.task_id import TaskId
-from tests.core.conftest import init_managers
 
 
 
 
-def test_set_and_get_sequence(init_sql_repo):
+def test_set_and_get_sequence(init_sql_repo, init_managers):
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
     init_managers()
     init_managers()
@@ -102,7 +102,7 @@ def test_set_and_get_sequence(init_sql_repo):
     assert _TaskManager._get(task.id).id == task.id
     assert _TaskManager._get(task.id).id == task.id
 
 
 
 
-def test_get_all_on_multiple_versions_environment(init_sql_repo):
+def test_get_all_on_multiple_versions_environment(init_sql_repo, init_managers):
     init_managers()
     init_managers()
 
 
     # Create 5 sequences from Scenario with 2 versions each
     # Create 5 sequences from Scenario with 2 versions each
@@ -165,7 +165,7 @@ def mult_by_3(nb: int):
     return nb * 3
     return nb * 3
 
 
 
 
-def test_get_or_create_data(init_sql_repo):
+def test_get_or_create_data(init_sql_repo, init_managers):
     # only create intermediate data node once
     # only create intermediate data node once
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
@@ -219,7 +219,7 @@ def test_get_or_create_data(init_sql_repo):
         sequence.WRONG.write(7)
         sequence.WRONG.write(7)
 
 
 
 
-def test_hard_delete_one_single_sequence_with_scenario_data_nodes(init_sql_repo):
+def test_hard_delete_one_single_sequence_with_scenario_data_nodes(init_sql_repo, init_managers):
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
     init_managers()
     init_managers()
@@ -250,7 +250,7 @@ def test_hard_delete_one_single_sequence_with_scenario_data_nodes(init_sql_repo)
     assert len(_JobManager._get_all()) == 1
     assert len(_JobManager._get_all()) == 1
 
 
 
 
-def test_hard_delete_one_single_sequence_with_cycle_data_nodes(init_sql_repo):
+def test_hard_delete_one_single_sequence_with_cycle_data_nodes(init_sql_repo, init_managers):
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
     init_managers()
     init_managers()
@@ -281,7 +281,7 @@ def test_hard_delete_one_single_sequence_with_cycle_data_nodes(init_sql_repo):
     assert len(_JobManager._get_all()) == 1
     assert len(_JobManager._get_all()) == 1
 
 
 
 
-def test_hard_delete_shared_entities(init_sql_repo):
+def test_hard_delete_shared_entities(init_sql_repo, init_managers):
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
     Config.configure_job_executions(mode=JobConfig._DEVELOPMENT_MODE)
 
 
     init_managers()
     init_managers()

+ 4 - 4
tests/core/test_core_cli.py

@@ -12,6 +12,7 @@
 from unittest.mock import patch
 from unittest.mock import patch
 
 
 import pytest
 import pytest
+
 from taipy.config.common.frequency import Frequency
 from taipy.config.common.frequency import Frequency
 from taipy.config.common.scope import Scope
 from taipy.config.common.scope import Scope
 from taipy.config.config import Config
 from taipy.config.config import Config
@@ -26,7 +27,6 @@ from taipy.core.job._job_manager import _JobManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.task._task_manager import _TaskManager
 from taipy.core.task._task_manager import _TaskManager
-from tests.core.conftest import init_config
 from tests.core.utils import assert_true_after_time
 from tests.core.utils import assert_true_after_time
 
 
 
 
@@ -78,7 +78,7 @@ def test_core_cli_experiment_mode_with_version():
         core.stop()
         core.stop()
 
 
 
 
-def test_core_cli_experiment_mode_with_force_version():
+def test_core_cli_experiment_mode_with_force_version(init_config):
     with patch("sys.argv", ["prog", "--experiment", "2.1", "--taipy-force"]):
     with patch("sys.argv", ["prog", "--experiment", "2.1", "--taipy-force"]):
         init_config()
         init_config()
         core = Core()
         core = Core()
@@ -458,7 +458,7 @@ def test_force_override_production_version():
         core.stop()
         core.stop()
 
 
 
 
-def test_modify_job_configuration_dont_stop_application(caplog):
+def test_modify_job_configuration_dont_stop_application(caplog, init_config):
     scenario_config = config_scenario()
     scenario_config = config_scenario()
 
 
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
@@ -487,7 +487,7 @@ def test_modify_job_configuration_dont_stop_application(caplog):
         core.stop()
         core.stop()
 
 
 
 
-def test_modify_config_properties_without_force(caplog):
+def test_modify_config_properties_without_force(caplog, init_config):
     scenario_config = config_scenario()
     scenario_config = config_scenario()
 
 
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):

+ 6 - 7
tests/core/test_core_cli_with_sql_repo.py

@@ -27,7 +27,6 @@ from taipy.core.job._job_manager import _JobManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.task._task_manager import _TaskManager
 from taipy.core.task._task_manager import _TaskManager
-from tests.core.conftest import init_config, init_managers
 from tests.core.utils import assert_true_after_time
 from tests.core.utils import assert_true_after_time
 
 
 
 
@@ -99,7 +98,7 @@ def test_core_cli_production_mode(init_sql_repo):
         core.stop()
         core.stop()
 
 
 
 
-def test_dev_mode_clean_all_entities_of_the_latest_version(init_sql_repo):
+def test_dev_mode_clean_all_entities_of_the_latest_version(init_sql_repo, init_managers):
     scenario_config = config_scenario()
     scenario_config = config_scenario()
     init_managers()
     init_managers()
 
 
@@ -303,7 +302,7 @@ def test_version_number_when_switching_mode(init_sql_repo):
         core.stop()
         core.stop()
 
 
 
 
-def test_production_mode_load_all_entities_from_previous_production_version(init_sql_repo):
+def test_production_mode_load_all_entities_from_previous_production_version(init_sql_repo, init_managers):
     scenario_config = config_scenario()
     scenario_config = config_scenario()
     init_managers()
     init_managers()
 
 
@@ -354,7 +353,7 @@ def test_production_mode_load_all_entities_from_previous_production_version(init
         core.stop()
         core.stop()
 
 
 
 
-def test_force_override_experiment_version(init_sql_repo):
+def test_force_override_experiment_version(init_sql_repo, init_managers):
     scenario_config = config_scenario()
     scenario_config = config_scenario()
     init_managers()
     init_managers()
 
 
@@ -407,7 +406,7 @@ def test_force_override_experiment_version(init_sql_repo):
     assert len(_JobManager._get_all()) == 2
     assert len(_JobManager._get_all()) == 2
 
 
 
 
-def test_force_override_production_version(init_sql_repo):
+def test_force_override_production_version(init_sql_repo, init_managers):
     scenario_config = config_scenario()
     scenario_config = config_scenario()
     init_managers()
     init_managers()
 
 
@@ -462,7 +461,7 @@ def test_force_override_production_version(init_sql_repo):
         core.stop()
         core.stop()
 
 
 
 
-def test_modify_config_properties_without_force(caplog, init_sql_repo):
+def test_modify_config_properties_without_force(caplog, init_sql_repo, init_config, init_managers):
     scenario_config = config_scenario()
     scenario_config = config_scenario()
     init_managers()
     init_managers()
 
 
@@ -505,7 +504,7 @@ def test_modify_config_properties_without_force(caplog, init_sql_repo):
     assert 'DATA_NODE "d2" has attribute "exposed_type" modified' in error_message
     assert 'DATA_NODE "d2" has attribute "exposed_type" modified' in error_message
 
 
 
 
-def test_modify_job_configuration_dont_stop_application(caplog, init_sql_repo):
+def test_modify_job_configuration_dont_stop_application(caplog, init_sql_repo, init_config, init_managers):
     scenario_config = config_scenario()
     scenario_config = config_scenario()
     init_managers()
     init_managers()
 
 

+ 9 - 10
tests/core/version/test_production_version_migration.py

@@ -16,7 +16,6 @@ from taipy.config.config import Config
 from taipy.core import Core, taipy
 from taipy.core import Core, taipy
 from taipy.core.data._data_manager import _DataManager
 from taipy.core.data._data_manager import _DataManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
-from tests.core.conftest import init_config
 from tests.core.utils import assert_true_after_time
 from tests.core.utils import assert_true_after_time
 
 
 m = multiprocessing.Manager()
 m = multiprocessing.Manager()
@@ -45,7 +44,7 @@ def migrate_foo_scenario(scenario):
     return scenario
     return scenario
 
 
 
 
-def test_migrate_datanode():
+def test_migrate_datanode(init_config):
     scenario_v1 = submit_v1()
     scenario_v1 = submit_v1()
 
 
     init_config()
     init_config()
@@ -57,7 +56,7 @@ def test_migrate_datanode():
     assert v1.d1.path == "bar.pkl"
     assert v1.d1.path == "bar.pkl"
 
 
 
 
-def test_migrate_datanode_in_standalone_mode():
+def test_migrate_datanode_in_standalone_mode(init_config):
     scenario_v1 = submit_v1()
     scenario_v1 = submit_v1()
 
 
     init_config()
     init_config()
@@ -77,7 +76,7 @@ def test_migrate_datanode_in_standalone_mode():
         core.stop()
         core.stop()
 
 
 
 
-def test_migrate_task():
+def test_migrate_task(init_config):
     scenario_v1 = submit_v1()
     scenario_v1 = submit_v1()
 
 
     init_config()
     init_config()
@@ -89,7 +88,7 @@ def test_migrate_task():
     assert v1.my_task.skippable is True
     assert v1.my_task.skippable is True
 
 
 
 
-def test_migrate_task_in_standalone_mode():
+def test_migrate_task_in_standalone_mode(init_config):
     scenario_v1 = submit_v1()
     scenario_v1 = submit_v1()
 
 
     init_config()
     init_config()
@@ -109,7 +108,7 @@ def test_migrate_task_in_standalone_mode():
         core.stop()
         core.stop()
 
 
 
 
-def test_migrate_scenario():
+def test_migrate_scenario(init_config):
     scenario_v1 = submit_v1()
     scenario_v1 = submit_v1()
 
 
     init_config()
     init_config()
@@ -121,7 +120,7 @@ def test_migrate_scenario():
     assert v1.properties["foo"] == "bar"
     assert v1.properties["foo"] == "bar"
 
 
 
 
-def test_migrate_scenario_in_standalone_mode():
+def test_migrate_scenario_in_standalone_mode(init_config):
     scenario_v1 = submit_v1()
     scenario_v1 = submit_v1()
 
 
     init_config()
     init_config()
@@ -141,7 +140,7 @@ def test_migrate_scenario_in_standalone_mode():
         core.stop()
         core.stop()
 
 
 
 
-def test_migrate_all_entities():
+def test_migrate_all_entities(init_config):
     scenario_v1 = submit_v1()
     scenario_v1 = submit_v1()
 
 
     init_config()
     init_config()
@@ -160,7 +159,7 @@ def test_migrate_all_entities():
     assert v1.properties["foo"] == "bar"
     assert v1.properties["foo"] == "bar"
 
 
 
 
-def test_migrate_all_entities_in_standalone_mode():
+def test_migrate_all_entities_in_standalone_mode(init_config):
     scenario_v1 = submit_v1()
     scenario_v1 = submit_v1()
 
 
     init_config()
     init_config()
@@ -180,7 +179,7 @@ def test_migrate_all_entities_in_standalone_mode():
         core.stop()
         core.stop()
 
 
 
 
-def test_migrate_compatible_version():
+def test_migrate_compatible_version(init_config):
     scenario_cfg = config_scenario_v1()
     scenario_cfg = config_scenario_v1()
     # Production 1.0
     # Production 1.0
     with patch("sys.argv", ["prog", "--production", "1.0"]):
     with patch("sys.argv", ["prog", "--production", "1.0"]):

+ 1 - 2
tests/core/version/test_version_cli.py

@@ -25,7 +25,6 @@ from taipy.core.job._job_manager import _JobManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.task._task_manager import _TaskManager
 from taipy.core.task._task_manager import _TaskManager
-from tests.core.conftest import init_config
 
 
 
 
 def test_delete_version(caplog):
 def test_delete_version(caplog):
@@ -233,7 +232,7 @@ def test_rename_version(caplog):
     assert len(_JobManager._get_all("2.1")) == 1
     assert len(_JobManager._get_all("2.1")) == 1
 
 
 
 
-def test_compare_version_config(caplog):
+def test_compare_version_config(caplog, init_config):
     scenario_config_1 = config_scenario()
     scenario_config_1 = config_scenario()
 
 
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):

+ 1 - 2
tests/core/version/test_version_cli_with_sql_repo.py

@@ -26,7 +26,6 @@ from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.scenario._scenario_manager_factory import _ScenarioManagerFactory
 from taipy.core.scenario._scenario_manager_factory import _ScenarioManagerFactory
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.task._task_manager import _TaskManager
 from taipy.core.task._task_manager import _TaskManager
-from tests.core.conftest import init_config
 
 
 
 
 def test_delete_version(caplog, init_sql_repo):
 def test_delete_version(caplog, init_sql_repo):
@@ -240,7 +239,7 @@ def test_rename_version(caplog, init_sql_repo):
     assert len(_JobManager._get_all("2.1")) == 1
     assert len(_JobManager._get_all("2.1")) == 1
 
 
 
 
-def test_compare_version_config(caplog, init_sql_repo):
+def test_compare_version_config(caplog, init_sql_repo, init_config):
     _ScenarioManagerFactory._build_manager()
     _ScenarioManagerFactory._build_manager()
 
 
     scenario_config_1 = config_scenario()
     scenario_config_1 = config_scenario()