Dev

.github/workflows/dev_python3_10.yml

@@ -39,9 +39,5 @@ jobs:
         run: python ./test/unit_test/generate_report/generate_xml_report.py
       - name: Test Generate JSON Report
         run: python ./test/unit_test/generate_report/generate_json_report.py
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
       - name: Test Executor
         run: python ./test/unit_test/executor_test/execute.py

.github/workflows/dev_python3_11.yml

@@ -39,9 +39,5 @@ jobs:
         run: python ./test/unit_test/generate_report/generate_xml_report.py
       - name: Test Generate JSON Report
         run: python ./test/unit_test/generate_report/generate_json_report.py
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
       - name: Test Executor
         run: python ./test/unit_test/executor_test/execute.py

.github/workflows/dev_python3_9.yml

@@ -39,9 +39,5 @@ jobs:
         run: python ./test/unit_test/generate_report/generate_xml_report.py
       - name: Test Generate JSON Report
         run: python ./test/unit_test/generate_report/generate_json_report.py
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
       - name: Test Executor
         run: python ./test/unit_test/executor_test/execute.py

.github/workflows/stable_python3_10.yml

@@ -39,9 +39,5 @@ jobs:
         run: python ./test/unit_test/generate_report/generate_xml_report.py
       - name: Test Generate JSON Report
         run: python ./test/unit_test/generate_report/generate_json_report.py
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
       - name: Test Executor
         run: python ./test/unit_test/executor_test/execute.py

.github/workflows/stable_python3_11.yml

@@ -39,9 +39,5 @@ jobs:
         run: python ./test/unit_test/generate_report/generate_xml_report.py
       - name: Test Generate JSON Report
         run: python ./test/unit_test/generate_report/generate_json_report.py
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
       - name: Test Executor
         run: python ./test/unit_test/executor_test/execute.py

.github/workflows/stable_python3_9.yml

@@ -39,9 +39,5 @@ jobs:
         run: python ./test/unit_test/generate_report/generate_xml_report.py
       - name: Test Generate JSON Report
         run: python ./test/unit_test/generate_report/generate_json_report.py
-      - name: Test Interval Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_interval_test.py
-      - name: Test Cron Scheduler
-        run: python ./test/unit_test/scheduler_test/sec_cron_test.py
       - name: Test Executor
         run: python ./test/unit_test/executor_test/execute.py

dev.toml

@@ -6,23 +6,22 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_load_density_dev"
-version = "0.0.66"
+version = "0.0.67"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]
 description = "Load & Stress Automation Freamework"
 requires-python = ">=3.9"
-license = { text = "MIT" }
+license-files = ["LICENSE"]
 dependencies = [
-    "locust", "APScheduler",
+    "locust",
 ]
 classifiers = [
     "Programming Language :: Python :: 3.9",
     "Development Status :: 2 - Pre-Alpha",
     "Environment :: Win32 (MS Windows)",
     "Environment :: MacOS X",
     "Environment :: X11 Applications",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent"
 ]
 
@@ -35,8 +34,6 @@ Code = "https://github.com/Intergration-Automation-Testing/LoadDensity"
 file = "README.md"
 content-type = "text/markdown"
 
-[tool.setuptools]
-license-files = ["LICENSE"]
 
 [tool.setuptools.packages]
 find = { namespaces = false }

je_load_density/__init__.py

@@ -41,11 +41,8 @@
 
 from je_load_density.utils.project.create_project_structure import create_project_dir
 
-# Scheduler
-from je_load_density.utils.scheduler.extend_apscheduler import SchedulerManager
-
 __all__ = [
-    "create_env", "start_test", "SchedulerManager",
+    "create_env", "start_test",
     "locust_wrapper_proxy",
     "prepare_env", "prepare_env",
     "test_record_instance",

je_load_density/utils/executor/action_executor.py

@@ -12,7 +12,6 @@
 from je_load_density.utils.generate_report.generate_xml_report import generate_xml, generate_xml_report
 from je_load_density.utils.json.json_file.json_file import read_action_json
 from je_load_density.utils.package_manager.package_manager_class import package_manager
-from je_load_density.utils.scheduler.extend_apscheduler import scheduler_manager
 from je_load_density.wrapper.start_wrapper.start_test import start_test
 
 
@@ -31,15 +30,6 @@ def __init__(self):
             "LD_execute_action": self.execute_action,
             "LD_execute_files": self.execute_files,
             "LD_add_package_to_executor": package_manager.add_package_to_executor,
-            # Scheduler
-            "LD_scheduler_event_trigger": self.scheduler_event_trigger,
-            "LD_remove_blocking_scheduler_job": scheduler_manager.remove_blocking_job,
-            "LD_remove_nonblocking_scheduler_job": scheduler_manager.remove_nonblocking_job,
-            "LD_start_blocking_scheduler": scheduler_manager.start_block_scheduler,
-            "LD_start_nonblocking_scheduler": scheduler_manager.start_nonblocking_scheduler,
-            "LD_start_all_scheduler": scheduler_manager.start_all_scheduler,
-            "LD_shutdown_blocking_scheduler": scheduler_manager.shutdown_blocking_scheduler,
-            "LD_shutdown_nonblocking_scheduler": scheduler_manager.shutdown_nonblocking_scheduler,
         }
         # get all builtin function and add to event dict
         for function in getmembers(builtins, isbuiltin):
@@ -108,17 +98,6 @@ def execute_files(self, execute_files_list: list):
             execute_detail_list.append(self.execute_action(read_action_json(file)))
         return execute_detail_list
 
-    def scheduler_event_trigger(
-            self, function: str, id: str = None, args: Union[list, tuple] = None,
-            kwargs: dict = None, scheduler_type: str = "nonblocking", wait_type: str = "secondly",
-            wait_value: int = 1, **trigger_args: Any) -> None:
-        if scheduler_type == "nonblocking":
-            scheduler_event = scheduler_manager.nonblocking_scheduler_event_dict.get(wait_type)
-        else:
-            scheduler_event = scheduler_manager.blocking_scheduler_event_dict.get(wait_type)
-        scheduler_event(self.event_dict.get(function), id, args, kwargs, wait_value, **trigger_args)
-
-
 executor = Executor()
 package_manager.executor = executor