浏览代码

fix: simplify core cli tests

trgiangdo 1 年之前
父节点
当前提交
9be9f56e95
共有 2 个文件被更改,包括 10 次插入36 次删除
  1. 6 19
      tests/core/test_core_cli.py
  2. 4 17
      tests/core/test_core_cli_with_sql_repo.py

+ 6 - 19
tests/core/test_core_cli.py

@@ -27,7 +27,6 @@ from taipy.core.job._job_manager import _JobManager
 from taipy.core.scenario._scenario_manager import _ScenarioManager
 from taipy.core.sequence._sequence_manager import _SequenceManager
 from taipy.core.task._task_manager import _TaskManager
-from tests.core.utils import assert_true_after_time
 
 
 def test_core_cli_no_arguments():
@@ -457,54 +456,42 @@ def test_force_override_production_version():
         core.stop()
 
 
-@pytest.mark.standalone
 def test_modified_job_configuration_dont_block_application_run(caplog, init_config):
-    scenario_config = config_scenario()
+    _ = config_scenario()
 
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
         core = Core()
         Config.configure_job_executions(mode="development")
-        core.run(force_restart=True)
-        scenario = _ScenarioManager._create(scenario_config)
-        jobs = taipy.submit(scenario).jobs
-        assert all(job.is_finished() for job in jobs)
+        core.run()
         core.stop()
     init_config()
-    scenario_config = config_scenario()
+    _ = config_scenario()
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
         core = Core()
         Config.configure_job_executions(mode="standalone", max_nb_of_workers=3)
-        core.run(force_restart=True)
-        scenario = _ScenarioManager._create(scenario_config)
-        jobs = taipy.submit(scenario).jobs
-        assert_true_after_time(lambda: all(job.is_finished() for job in jobs))
+        core.run()
         error_message = str(caplog.text)
         assert 'JOB "mode" was modified' in error_message
         assert 'JOB "max_nb_of_workers" was added' in error_message
         core.stop()
 
 
-@pytest.mark.standalone
 def test_modified_config_properties_without_force(caplog, init_config):
-    scenario_config = config_scenario()
+    _ = config_scenario()
 
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
         core = Core()
         core.run()
-        scenario = _ScenarioManager._create(scenario_config)
-        taipy.submit(scenario)
         core.stop()
 
     init_config()
 
-    scenario_config_2 = config_scenario_2()
+    _ = config_scenario_2()
 
     with pytest.raises(SystemExit):
         with patch("sys.argv", ["prog", "--experiment", "1.0"]):
             core = Core()
             core.run()
-            scenario = _ScenarioManager._create(scenario_config_2)
-            taipy.submit(scenario)
     core.stop()
     error_message = str(caplog.text)
 

+ 4 - 17
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.sequence._sequence_manager import _SequenceManager
 from taipy.core.task._task_manager import _TaskManager
-from tests.core.utils import assert_true_after_time
 
 
 def test_core_cli_no_arguments(init_sql_repo):
@@ -458,26 +457,22 @@ def test_force_override_production_version(init_sql_repo):
 
 
 def test_modify_config_properties_without_force(caplog, init_sql_repo, init_config):
-    scenario_config = config_scenario()
+    _ = config_scenario()
 
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
         core = Core()
         core.run()
-        scenario = _ScenarioManager._create(scenario_config)
-        _ScenarioManager._submit(scenario)
         core.stop()
 
     init_config()
     Config.configure_core(repository_type="sql", repository_properties={"db_location": init_sql_repo})
 
-    scenario_config_2 = config_scenario_2()
+    _ = config_scenario_2()
 
     with pytest.raises(SystemExit):
         with patch("sys.argv", ["prog", "--experiment", "1.0"]):
             core = Core()
             core.run()
-            scenario = _ScenarioManager._create(scenario_config_2)
-            _ScenarioManager._submit(scenario)
     core.stop()
 
     error_message = str(caplog.text)
@@ -500,35 +495,27 @@ def test_modify_config_properties_without_force(caplog, init_sql_repo, init_conf
 
 
 def test_modify_job_configuration_dont_stop_application(caplog, init_sql_repo, init_config):
-    scenario_config = config_scenario()
+    _ = config_scenario()
 
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
         Config.configure_job_executions(mode="development")
         core = Core()
         core.run(force_restart=True)
-        scenario = _ScenarioManager._create(scenario_config)
-        jobs = _ScenarioManager._submit(scenario).jobs
-        assert all(job.is_finished() for job in jobs)
         core.stop()
 
     init_config()
     Config.configure_core(repository_type="sql", repository_properties={"db_location": init_sql_repo})
 
-    scenario_config = config_scenario()
+    _ = config_scenario()
 
     with patch("sys.argv", ["prog", "--experiment", "1.0"]):
         Config.configure_job_executions(mode="standalone", max_nb_of_workers=3)
         core = Core()
         core.run(force_restart=True)
-        scenario = _ScenarioManager._create(scenario_config)
-
-        jobs = _ScenarioManager._submit(scenario).jobs
-        assert_true_after_time(lambda: all(job.is_finished() for job in jobs))
         error_message = str(caplog.text)
         assert 'JOB "mode" was modified' in error_message
         assert 'JOB "max_nb_of_workers" was added' in error_message
         core.stop()
-        assert_true_after_time(lambda: core._dispatcher is None)
 
 
 def twice(a):